@subwallet/extension-base 1.3.28-0 → 1.3.29-0

package/cjs/core/logic-validation/transfer.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.additionalValidateTransferForRecipient = additionalValidateTransferForRecipient;
-exports.additionalValidateXcmTransfer = additionalValidateXcmTransfer;
 exports.checkBalanceWithTransactionFee = checkBalanceWithTransactionFee;
 exports.checkSigningAccountForTransaction = checkSigningAccountForTransaction;
 exports.checkSupportForAction = checkSupportForAction;
@@ -60,13 +59,27 @@ function validateTransferRequest(tokenInfo, from, to, value, transferAll) {
 }
 function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
   const sendingTokenMinAmount = BigInt((0, _utils3._getTokenMinAmount)(sendingTokenInfo));
+  const sendingTokenMinAmountXCM = new _bignumber.default((0, _utils3._getTokenMinAmount)(sendingTokenInfo)).multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO);
   const nativeTokenMinAmount = (0, _utils3._getTokenMinAmount)(nativeTokenInfo);
   const warnings = [];
   const errors = [];
   const remainingSendingTokenOfSenderEnoughED = senderSendingTokenTransferable ? senderSendingTokenTransferable - transferAmount >= sendingTokenMinAmount : false;
   const isReceiverAliveByNativeToken = receiverSystemAccountInfo ? (0, _systemPallet._isAccountActive)(receiverSystemAccountInfo) : false;
   const isReceivingAmountPassED = receiverSendingTokenKeepAliveBalance + transferAmount >= sendingTokenMinAmount;
-  if (extrinsicType === _KoniTypes.ExtrinsicType.TRANSFER_TOKEN) {
+  const enoughAmountForXCM = extrinsicType === _KoniTypes.ExtrinsicType.TRANSFER_XCM ? new _bignumber.default(transferAmount.toString()).gte(sendingTokenMinAmountXCM) : true;
+  if (!enoughAmountForXCM) {
+    const minXCMStr = (0, _utils5.formatNumber)(sendingTokenMinAmountXCM.toString(), (0, _utils3._getAssetDecimals)(sendingTokenInfo), _utils5.balanceFormatter, {
+      maxNumberFormat: (0, _utils3._getAssetDecimals)(sendingTokenInfo) || 6
+    });
+    const error = new _TransactionError.TransactionError(_types.TransferTxErrorType.NOT_ENOUGH_VALUE, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the recipient account alive. Increase amount and try again', {
+      replace: {
+        amount: minXCMStr,
+        symbol: sendingTokenInfo.symbol
+      }
+    }));
+    errors.push(error);
+  }
+  if (!(0, _utils3._isNativeToken)(sendingTokenInfo)) {
     if (!remainingSendingTokenOfSenderEnoughED) {
       const warning = new _TransactionWarning.TransactionWarning(_types.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
       warnings.push(warning);
@@ -123,53 +136,6 @@ function validateXcmTransferRequest(destTokenInfo, sender, sendingValue) {
   }
   return [errors, keypair];
 }
-function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, sendingAmount, senderTransferable, receiverNativeBalance, destChainInfo) {
-  let isSnowBridge = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  const destMinAmount = (0, _utils3._getTokenMinAmount)(destinationTokenInfo);
-  const minSendingRequired = new _bignumber.default(destMinAmount).multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO);
-  let error;
-  let warning;
-
-  // Check sending token ED for receiver
-  if (new _bignumber.default(sendingAmount).lt(minSendingRequired)) {
-    const atLeastStr = (0, _utils5.formatNumber)(minSendingRequired, destinationTokenInfo.decimals || 0, _utils5.balanceFormatter, {
-      maxNumberFormat: destinationTokenInfo.decimals || 6
-    });
-    error = new _TransactionError.TransactionError(_types.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
-      }
-    }));
-  }
-
-  // check native token ED on dest chain for receiver
-  const bnKeepAliveBalance = (0, _utils3._isNativeToken)(destinationTokenInfo) ? new _bignumber.default(receiverNativeBalance).plus(sendingAmount) : new _bignumber.default(receiverNativeBalance);
-  if (isSnowBridge && bnKeepAliveBalance.lt((0, _utils3._getChainExistentialDeposit)(destChainInfo))) {
-    const {
-      decimals,
-      symbol
-    } = (0, _utils3._getChainNativeTokenBasicInfo)(destChainInfo);
-    const atLeastStr = (0, _utils5.formatNumber)((0, _utils3._getChainExistentialDeposit)(destChainInfo), decimals || 0, _utils5.balanceFormatter, {
-      maxNumberFormat: 6
-    });
-    error = new _TransactionError.TransactionError(_types.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)(' Insufficient {{symbol}} on {{chain}} to cover min balance ({{amount}} {{symbol}})', {
-      replace: {
-        amount: atLeastStr,
-        symbol,
-        chain: destChainInfo.name
-      }
-    }));
-  }
-
-  // Check ed for sender
-  if (!(0, _utils3._isNativeToken)(originTokenInfo)) {
-    if (new _bignumber.default(senderTransferable).minus(sendingAmount).lt((0, _utils3._getTokenMinAmount)(originTokenInfo))) {
-      warning = new _TransactionWarning.TransactionWarning(_types.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
-    }
-  }
-  return [warning, error];
-}
 function checkSupportForFeature(validationResponse, blockedFeaturesList, chainInfo) {
   const extrinsicType = validationResponse.extrinsicType;
   const chain = validationResponse.chain;

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

@@ -1185,7 +1185,6 @@ class KoniExtension {
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(tokenSlug);
     const errors = (0, _transfer.validateTransferRequest)(transferTokenInfo, from, to, value, transferAll);
     const warnings = [];
-    const chainInfo = this.#koniState.getChainInfo(chain);
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(chain);
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
@@ -1301,7 +1300,7 @@ class KoniExtension {
     const additionalValidator = async inputTransaction => {
       let senderSendingTokenTransferable;
       let receiverSystemAccountInfo;
-      if (!(0, _utils5._isChainSubstrateCompatible)(chainInfo)) {
+      if (chainType !== _KoniTypes.ChainType.SUBSTRATE) {
         return undefined;
       }
 
@@ -1392,6 +1391,8 @@ class KoniExtension {
     } = inputData;
     const originTokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, tokenSlug);
+    const destinationNativeTokenInfo = this.#koniState.getNativeTokenInfo(destinationNetworkKey);
+    const destinationNativeTokenSlug = destinationNativeTokenInfo.slug;
     const [errors, fromKeyPair] = (0, _transfer.validateXcmTransferRequest)(destinationTokenInfo, from, value);
     let extrinsic = null;
     if (errors.length > 0) {
@@ -1403,6 +1404,7 @@ class KoniExtension {
     const isSnowBridgeEvmTransfer = (0, _utils5._isPureEvmChain)(chainInfoMap[originNetworkKey]) && (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = (0, _polygonBridge._isPolygonChainBridge)(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = (0, _posBridge._isPosChainBridge)(originNetworkKey, destinationNetworkKey);
+    const extrinsicType = _KoniTypes.ExtrinsicType.TRANSFER_XCM;
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let additionalValidator;
@@ -1453,28 +1455,47 @@ class KoniExtension {
         extrinsic = (0, _tokenPayFee.batchExtrinsicSetFeeHydration)(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
       }
       additionalValidator = async inputTransaction => {
+        let isSendingTokenSufficient = false;
+        let receiverSystemAccountInfo;
+        if (!(0, _utils5._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
+          return undefined;
+        }
         const {
-          value: senderTransferable
+          value: _senderTransferable
         } = await this.getAddressTransferableBalance({
           address: from,
           networkKey: originNetworkKey,
           token: originTokenInfo.slug
         });
-        const isSnowBridge = (0, _xcmParser._isSnowBridgeXcm)(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
-        let recipientNativeBalance = '0';
-        if (isSnowBridge) {
-          const {
-            value
-          } = await this.getAddressTransferableBalance({
+        const senderTransferable = BigInt(_senderTransferable);
+        const sendingAmount = BigInt(value);
+        const {
+          value: _receiverDestinationTokenKeepAliveBalance
+        } = await this.getAddressTotalBalance({
+          address: to,
+          networkKey: destinationNetworkKey,
+          token: destinationTokenInfo.slug,
+          extrinsicType
+        });
+        const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
+        if (!(0, _utils5._isNativeToken)(destinationTokenInfo)) {
+          const _receiverNativeTotal = await this.getAddressTotalBalance({
             address: to,
             networkKey: destinationNetworkKey,
-            extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_BALANCE
+            token: destinationNativeTokenSlug,
+            extrinsicType
           });
-          recipientNativeBalance = value;
+          receiverSystemAccountInfo = _receiverNativeTotal.metadata;
         }
-        const [warning, error] = (0, _transfer.additionalValidateXcmTransfer)(originTokenInfo, destinationTokenInfo, value, senderTransferable, recipientNativeBalance, chainInfoMap[destinationNetworkKey], isSnowBridge);
-        error && inputTransaction.errors.push(error);
-        warning && inputTransaction.warnings.push(warning);
+        if ((0, _utils5._isChainSubstrateCompatible)(chainInfoMap[destinationNetworkKey])) {
+          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+          isSendingTokenSufficient = await (0, _utils._isSufficientToken)(destinationTokenInfo, substrateApi);
+        }
+        const [warning, error] = (0, _transfer.additionalValidateTransferForRecipient)(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
+        // different from sendingTokenInfo being passed in
+        receiverSystemAccountInfo, isSendingTokenSufficient);
+        warning.length && inputTransaction.warnings.push(...warning);
+        error.length && inputTransaction.errors.push(...error);
       };
       eventsHandler = eventEmitter => {
         eventEmitter.on('send', () => {
@@ -1506,7 +1527,7 @@ class KoniExtension {
       chain: originNetworkKey,
       transaction: extrinsic,
       data: inputData,
-      extrinsicType: _KoniTypes.ExtrinsicType.TRANSFER_XCM,
+      extrinsicType,
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? _KoniTypes.ChainType.SUBSTRATE : _KoniTypes.ChainType.EVM,
       transferNativeAmount: (0, _utils5._isNativeToken)(originTokenInfo) ? value : '0',
       ignoreWarnings,

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

@@ -1285,9 +1285,14 @@ class KoniState {
     }
     return result;
   }
+  scanAddressOnAdd = [];
   onAccountAdd() {
     this.eventService.on('account.add', address => {
-      this.balanceService.autoEnableChains([address]).catch(this.logger.error);
+      this.scanAddressOnAdd.push(address);
+      (0, _utils3.addLazy)('autoScanBalanceOnAdd', () => {
+        this.balanceService.autoEnableChains(this.scanAddressOnAdd).catch(this.logger.error);
+        this.scanAddressOnAdd = [];
+      }, 500, 5000, false);
     });
   }
   onAccountRemove() {

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.28-0'
+  version: '1.3.29-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -16,6 +16,7 @@ var _DetectAccountBalance = _interopRequireDefault(require("@subwallet/extension
 var _utils2 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _types2 = require("@subwallet/keyring/types");
+var _subwalletApiSdk = _interopRequireDefault(require("@subwallet/subwallet-api-sdk"));
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
@@ -422,9 +423,29 @@ class BalanceService {
         return null;
       }
     });
+    const evmPromiseList = addresses.map(address => {
+      const type = (0, _keyring.getKeypairTypeByAddress)(address);
+      const typeValid = [..._types2.EthereumKeypairTypes].includes(type);
+      if (typeValid) {
+        return new Promise(resolve => {
+          var _subwalletApiSdk$bala;
+          const timeOutPromise = new Promise(_resolve => {
+            setTimeout(() => _resolve([]), 30000);
+          });
+          const apiPromise = ((_subwalletApiSdk$bala = _subwalletApiSdk.default.balanceDetectionApi) === null || _subwalletApiSdk$bala === void 0 ? void 0 : _subwalletApiSdk$bala.getEvmTokenBalanceSlug(address)) || Promise.resolve([]);
+          Promise.race([timeOutPromise, apiPromise]).then(result => resolve(result)).catch(error => {
+            console.error(error);
+            resolve(null);
+          });
+        });
+      } else {
+        return Promise.resolve(null);
+      }
+    });
     const needEnableChains = [];
     const needActiveTokens = [];
     const balanceDataList = await Promise.all(promiseList);
+    const evmBalanceDataList = await Promise.all(evmPromiseList);
     const currentAssetSettings = await this.state.chainService.getAssetSettings();
     const chainInfoMap = this.state.chainService.getChainInfoMap();
     const detectBalanceChainSlugMap = this.state.chainService.detectBalanceChainSlugMap;
@@ -474,6 +495,28 @@ class BalanceService {
         }
       }
     }
+    for (const balanceData of evmBalanceDataList) {
+      if (balanceData) {
+        for (const slug of balanceData) {
+          var _currentAssetSettings2;
+          const chainSlug = slug.split('-')[0];
+          const chainState = this.state.chainService.getChainStateByKey(chainSlug);
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === slug.toLowerCase());
+
+          // Cancel is chain is turned off by user
+          if (chainState && chainState.manualTurnOff) {
+            continue;
+          }
+          if (existedKey && !((_currentAssetSettings2 = currentAssetSettings[existedKey]) !== null && _currentAssetSettings2 !== void 0 && _currentAssetSettings2.visible)) {
+            needEnableChains.push(chainSlug);
+            needActiveTokens.push(existedKey);
+            currentAssetSettings[existedKey] = {
+              visible: true
+            };
+          }
+        }
+      }
+    }
     if (needActiveTokens.length) {
       await this.state.chainService.enableChains(needEnableChains);
       this.state.chainService.setAssetSettings({

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

@@ -300,7 +300,7 @@ const _XCM_CHAIN_GROUP = {
   // default is xTokens pallet
 };
 exports._XCM_CHAIN_GROUP = _XCM_CHAIN_GROUP;
-const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub'];
+const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub', 'hydradx_main'];
 exports.SUFFICIENT_CHAIN = SUFFICIENT_CHAIN;
 const _XCM_TYPE = {
   RP: `${_types._SubstrateChainType.RELAYCHAIN}-${_types._SubstrateChainType.PARACHAIN}`,

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

@@ -849,6 +849,7 @@ class ChainService {
     return true;
   }
   disableChain(chainSlug) {
+    let preventManualTurnOff = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const chainInfo = this.getChainInfoByKey(chainSlug);
     const chainStateMap = this.getChainStateMap();
     if (!chainStateMap[chainSlug].active || this.lockChainInfoMap) {
@@ -856,7 +857,7 @@ class ChainService {
     }
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
-    chainStateMap[chainSlug].manualTurnOff = true;
+    chainStateMap[chainSlug].manualTurnOff = !preventManualTurnOff;
     // Set disconnect state for inactive chain
     this.updateChainConnectionStatus(chainSlug, _types3._ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
@@ -864,7 +865,7 @@ class ChainService {
       ...chainInfo,
       active: false,
       currentProvider: chainStateMap[chainSlug].currentProvider,
-      manualTurnOff: true
+      manualTurnOff: !preventManualTurnOff
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
@@ -1772,7 +1773,7 @@ class ChainService {
       const activeChains = this.getActiveChainInfos();
       for (const chain of Object.keys(activeChains)) {
         if (!_constants._DEFAULT_ACTIVE_CHAINS.includes(chain)) {
-          this.disableChain(chain);
+          this.disableChain(chain, true);
         }
       }
 

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

@@ -10,7 +10,6 @@ import { KeyringPair } from '@subwallet/keyring/types';
 export declare function validateTransferRequest(tokenInfo: _ChainAsset, from: _Address, to: _Address, value: string | undefined, transferAll: boolean | undefined): TransactionError[];
 export declare function additionalValidateTransferForRecipient(sendingTokenInfo: _ChainAsset, nativeTokenInfo: _ChainAsset, extrinsicType: ExtrinsicType, receiverSendingTokenKeepAliveBalance: bigint, transferAmount: bigint, senderSendingTokenTransferable?: bigint, receiverSystemAccountInfo?: FrameSystemAccountInfo, isSendingTokenSufficient?: boolean): [TransactionWarning[], TransactionError[]];
 export declare function validateXcmTransferRequest(destTokenInfo: _ChainAsset | undefined, sender: _Address, sendingValue: string): [TransactionError[], KeyringPair | undefined];
-export declare function additionalValidateXcmTransfer(originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset, sendingAmount: string, senderTransferable: string, receiverNativeBalance: string, destChainInfo: _ChainInfo, isSnowBridge?: boolean): [TransactionWarning | undefined, TransactionError | undefined];
 export declare function checkSupportForFeature(validationResponse: SWTransactionResponse, blockedFeaturesList: string[], chainInfo: _ChainInfo): void;
 export declare function checkSupportForAction(validationResponse: SWTransactionResponse, blockedActionsMap: Record<ExtrinsicType, string[]>): void;
 export declare function checkSupportForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction): void;

package/core/logic-validation/transfer.js

@@ -9,7 +9,7 @@ import { _canAccountBeReaped, _isAccountActive } from '@subwallet/extension-base
 import { getCardanoAssetId } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/utils';
 import { isBounceableAddress } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getAssetDecimals, _getAssetPriceId, _getAssetSymbol, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isCIP26Token, _isNativeToken, _isNativeTokenBySlug, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetPriceId, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isCIP26Token, _isNativeToken, _isNativeTokenBySlug, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateToAmountByReservePool, FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE } from '@subwallet/extension-base/services/fee-service/utils';
 import { isCardanoTransaction, isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, TransferTxErrorType } from '@subwallet/extension-base/types';
@@ -44,13 +44,27 @@ export function validateTransferRequest(tokenInfo, from, to, value, transferAll)
 }
 export function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
   const sendingTokenMinAmount = BigInt(_getTokenMinAmount(sendingTokenInfo));
+  const sendingTokenMinAmountXCM = new BigN(_getTokenMinAmount(sendingTokenInfo)).multipliedBy(XCM_MIN_AMOUNT_RATIO);
   const nativeTokenMinAmount = _getTokenMinAmount(nativeTokenInfo);
   const warnings = [];
   const errors = [];
   const remainingSendingTokenOfSenderEnoughED = senderSendingTokenTransferable ? senderSendingTokenTransferable - transferAmount >= sendingTokenMinAmount : false;
   const isReceiverAliveByNativeToken = receiverSystemAccountInfo ? _isAccountActive(receiverSystemAccountInfo) : false;
   const isReceivingAmountPassED = receiverSendingTokenKeepAliveBalance + transferAmount >= sendingTokenMinAmount;
-  if (extrinsicType === ExtrinsicType.TRANSFER_TOKEN) {
+  const enoughAmountForXCM = extrinsicType === ExtrinsicType.TRANSFER_XCM ? new BigN(transferAmount.toString()).gte(sendingTokenMinAmountXCM) : true;
+  if (!enoughAmountForXCM) {
+    const minXCMStr = formatNumber(sendingTokenMinAmountXCM.toString(), _getAssetDecimals(sendingTokenInfo), balanceFormatter, {
+      maxNumberFormat: _getAssetDecimals(sendingTokenInfo) || 6
+    });
+    const error = new TransactionError(TransferTxErrorType.NOT_ENOUGH_VALUE, t('You must transfer at least {{amount}} {{symbol}} to keep the recipient account alive. Increase amount and try again', {
+      replace: {
+        amount: minXCMStr,
+        symbol: sendingTokenInfo.symbol
+      }
+    }));
+    errors.push(error);
+  }
+  if (!_isNativeToken(sendingTokenInfo)) {
     if (!remainingSendingTokenOfSenderEnoughED) {
       const warning = new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
       warnings.push(warning);
@@ -107,52 +121,6 @@ export function validateXcmTransferRequest(destTokenInfo, sender, sendingValue)
   }
   return [errors, keypair];
 }
-export function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, sendingAmount, senderTransferable, receiverNativeBalance, destChainInfo, isSnowBridge = false) {
-  const destMinAmount = _getTokenMinAmount(destinationTokenInfo);
-  const minSendingRequired = new BigN(destMinAmount).multipliedBy(XCM_MIN_AMOUNT_RATIO);
-  let error;
-  let warning;
-
-  // Check sending token ED for receiver
-  if (new BigN(sendingAmount).lt(minSendingRequired)) {
-    const atLeastStr = formatNumber(minSendingRequired, destinationTokenInfo.decimals || 0, balanceFormatter, {
-      maxNumberFormat: destinationTokenInfo.decimals || 6
-    });
-    error = 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
-      }
-    }));
-  }
-
-  // check native token ED on dest chain for receiver
-  const bnKeepAliveBalance = _isNativeToken(destinationTokenInfo) ? new BigN(receiverNativeBalance).plus(sendingAmount) : new BigN(receiverNativeBalance);
-  if (isSnowBridge && bnKeepAliveBalance.lt(_getChainExistentialDeposit(destChainInfo))) {
-    const {
-      decimals,
-      symbol
-    } = _getChainNativeTokenBasicInfo(destChainInfo);
-    const atLeastStr = formatNumber(_getChainExistentialDeposit(destChainInfo), decimals || 0, balanceFormatter, {
-      maxNumberFormat: 6
-    });
-    error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t(' Insufficient {{symbol}} on {{chain}} to cover min balance ({{amount}} {{symbol}})', {
-      replace: {
-        amount: atLeastStr,
-        symbol,
-        chain: destChainInfo.name
-      }
-    }));
-  }
-
-  // Check ed for sender
-  if (!_isNativeToken(originTokenInfo)) {
-    if (new BigN(senderTransferable).minus(sendingAmount).lt(_getTokenMinAmount(originTokenInfo))) {
-      warning = new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
-    }
-  }
-  return [warning, error];
-}
 export function checkSupportForFeature(validationResponse, blockedFeaturesList, chainInfo) {
   const extrinsicType = validationResponse.extrinsicType;
   const chain = validationResponse.chain;

package/koni/background/handlers/Extension.js

@@ -9,7 +9,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingType } from '@subwallet/extension-base/background/KoniTypes';
 import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, LATEST_SESSION } from '@subwallet/extension-base/constants';
-import { additionalValidateTransferForRecipient, additionalValidateXcmTransfer, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
+import { additionalValidateTransferForRecipient, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
@@ -1142,7 +1142,6 @@ export default class KoniExtension {
     const transferTokenInfo = this.#koniState.chainService.getAssetBySlug(tokenSlug);
     const errors = validateTransferRequest(transferTokenInfo, from, to, value, transferAll);
     const warnings = [];
-    const chainInfo = this.#koniState.getChainInfo(chain);
     const nativeTokenInfo = this.#koniState.getNativeTokenInfo(chain);
     const nativeTokenSlug = nativeTokenInfo.slug;
     const isTransferNativeToken = nativeTokenSlug === tokenSlug;
@@ -1258,7 +1257,7 @@ export default class KoniExtension {
     const additionalValidator = async inputTransaction => {
       let senderSendingTokenTransferable;
       let receiverSystemAccountInfo;
-      if (!_isChainSubstrateCompatible(chainInfo)) {
+      if (chainType !== ChainType.SUBSTRATE) {
         return undefined;
       }
 
@@ -1349,6 +1348,8 @@ export default class KoniExtension {
     } = inputData;
     const originTokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, tokenSlug);
+    const destinationNativeTokenInfo = this.#koniState.getNativeTokenInfo(destinationNetworkKey);
+    const destinationNativeTokenSlug = destinationNativeTokenInfo.slug;
     const [errors, fromKeyPair] = validateXcmTransferRequest(destinationTokenInfo, from, value);
     let extrinsic = null;
     if (errors.length > 0) {
@@ -1360,6 +1361,7 @@ export default class KoniExtension {
     const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = _isPolygonChainBridge(originNetworkKey, destinationNetworkKey);
     const isPosBridgeTransfer = _isPosChainBridge(originNetworkKey, destinationNetworkKey);
+    const extrinsicType = ExtrinsicType.TRANSFER_XCM;
     const isTransferNative = this.#koniState.getNativeTokenInfo(originNetworkKey).slug === tokenSlug;
     const isTransferLocalTokenAndPayThatTokenAsFee = !isTransferNative && tokenSlug === tokenPayFeeSlug;
     let additionalValidator;
@@ -1410,28 +1412,47 @@ export default class KoniExtension {
         extrinsic = batchExtrinsicSetFeeHydration(substrateApi, _extrinsic, feeSetting, hydrationFeeAssetId);
       }
       additionalValidator = async inputTransaction => {
+        let isSendingTokenSufficient = false;
+        let receiverSystemAccountInfo;
+        if (!_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
+          return undefined;
+        }
         const {
-          value: senderTransferable
+          value: _senderTransferable
         } = await this.getAddressTransferableBalance({
           address: from,
           networkKey: originNetworkKey,
           token: originTokenInfo.slug
         });
-        const isSnowBridge = _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]);
-        let recipientNativeBalance = '0';
-        if (isSnowBridge) {
-          const {
-            value
-          } = await this.getAddressTransferableBalance({
+        const senderTransferable = BigInt(_senderTransferable);
+        const sendingAmount = BigInt(value);
+        const {
+          value: _receiverDestinationTokenKeepAliveBalance
+        } = await this.getAddressTotalBalance({
+          address: to,
+          networkKey: destinationNetworkKey,
+          token: destinationTokenInfo.slug,
+          extrinsicType
+        });
+        const receiverDestinationTokenKeepAliveBalance = BigInt(_receiverDestinationTokenKeepAliveBalance);
+        if (!_isNativeToken(destinationTokenInfo)) {
+          const _receiverNativeTotal = await this.getAddressTotalBalance({
             address: to,
             networkKey: destinationNetworkKey,
-            extrinsicType: ExtrinsicType.TRANSFER_BALANCE
+            token: destinationNativeTokenSlug,
+            extrinsicType
           });
-          recipientNativeBalance = value;
+          receiverSystemAccountInfo = _receiverNativeTotal.metadata;
         }
-        const [warning, error] = additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, value, senderTransferable, recipientNativeBalance, chainInfoMap[destinationNetworkKey], isSnowBridge);
-        error && inputTransaction.errors.push(error);
-        warning && inputTransaction.warnings.push(warning);
+        if (_isChainSubstrateCompatible(chainInfoMap[destinationNetworkKey])) {
+          const substrateApi = this.#koniState.getSubstrateApi(destinationNetworkKey);
+          isSendingTokenSufficient = await _isSufficientToken(destinationTokenInfo, substrateApi);
+        }
+        const [warning, error] = additionalValidateTransferForRecipient(destinationTokenInfo, destinationNativeTokenInfo, extrinsicType, receiverDestinationTokenKeepAliveBalance, sendingAmount, senderTransferable,
+        // different from sendingTokenInfo being passed in
+        receiverSystemAccountInfo, isSendingTokenSufficient);
+        warning.length && inputTransaction.warnings.push(...warning);
+        error.length && inputTransaction.errors.push(...error);
       };
       eventsHandler = eventEmitter => {
         eventEmitter.on('send', () => {
@@ -1463,7 +1484,7 @@ export default class KoniExtension {
       chain: originNetworkKey,
       transaction: extrinsic,
       data: inputData,
-      extrinsicType: ExtrinsicType.TRANSFER_XCM,
+      extrinsicType,
       chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,

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

@@ -239,6 +239,7 @@ export default class KoniState {
     cancelSubscription(id: string): boolean;
     createUnsubscriptionHandle(id: string, unsubscribe: () => void): void;
     get detectBalanceChainSlugMap(): Record<string, string>;
+    scanAddressOnAdd: string[];
     onAccountAdd(): void;
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;

package/koni/background/handlers/State.js

@@ -37,7 +37,7 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
-import { isManifestV3, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
+import { addLazy, isManifestV3, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import { keyring } from '@subwallet/ui-keyring';
@@ -1265,9 +1265,14 @@ export default class KoniState {
     }
     return result;
   }
+  scanAddressOnAdd = [];
   onAccountAdd() {
     this.eventService.on('account.add', address => {
-      this.balanceService.autoEnableChains([address]).catch(this.logger.error);
+      this.scanAddressOnAdd.push(address);
+      addLazy('autoScanBalanceOnAdd', () => {
+        this.balanceService.autoEnableChains(this.scanAddressOnAdd).catch(this.logger.error);
+        this.scanAddressOnAdd = [];
+      }, 500, 5000, false);
     });
   }
   onAccountRemove() {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.28-0",
+  "version": "1.3.29-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2669,13 +2669,13 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.102-beta.19",
-    "@subwallet/extension-base": "^1.3.28-0",
-    "@subwallet/extension-chains": "^1.3.28-0",
-    "@subwallet/extension-dapp": "^1.3.28-0",
-    "@subwallet/extension-inject": "^1.3.28-0",
+    "@subwallet/chain-list": "0.2.102",
+    "@subwallet/extension-base": "^1.3.29-0",
+    "@subwallet/extension-chains": "^1.3.29-0",
+    "@subwallet/extension-dapp": "^1.3.29-0",
+    "@subwallet/extension-inject": "^1.3.29-0",
     "@subwallet/keyring": "^0.1.9",
-    "@subwallet/subwallet-api-sdk": "^1.3.28-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.29-0",
     "@subwallet/ui-keyring": "^0.1.9",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",

package/packageInfo.js

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

package/services/balance-service/index.js

@@ -12,6 +12,7 @@ import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAc
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
+import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import keyring from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
@@ -413,9 +414,29 @@ export class BalanceService {
         return null;
       }
     });
+    const evmPromiseList = addresses.map(address => {
+      const type = getKeypairTypeByAddress(address);
+      const typeValid = [...EthereumKeypairTypes].includes(type);
+      if (typeValid) {
+        return new Promise(resolve => {
+          var _subwalletApiSdk$bala;
+          const timeOutPromise = new Promise(_resolve => {
+            setTimeout(() => _resolve([]), 30000);
+          });
+          const apiPromise = ((_subwalletApiSdk$bala = subwalletApiSdk.balanceDetectionApi) === null || _subwalletApiSdk$bala === void 0 ? void 0 : _subwalletApiSdk$bala.getEvmTokenBalanceSlug(address)) || Promise.resolve([]);
+          Promise.race([timeOutPromise, apiPromise]).then(result => resolve(result)).catch(error => {
+            console.error(error);
+            resolve(null);
+          });
+        });
+      } else {
+        return Promise.resolve(null);
+      }
+    });
     const needEnableChains = [];
     const needActiveTokens = [];
     const balanceDataList = await Promise.all(promiseList);
+    const evmBalanceDataList = await Promise.all(evmPromiseList);
     const currentAssetSettings = await this.state.chainService.getAssetSettings();
     const chainInfoMap = this.state.chainService.getChainInfoMap();
     const detectBalanceChainSlugMap = this.state.chainService.detectBalanceChainSlugMap;
@@ -465,6 +486,28 @@ export class BalanceService {
         }
       }
     }
+    for (const balanceData of evmBalanceDataList) {
+      if (balanceData) {
+        for (const slug of balanceData) {
+          var _currentAssetSettings2;
+          const chainSlug = slug.split('-')[0];
+          const chainState = this.state.chainService.getChainStateByKey(chainSlug);
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === slug.toLowerCase());
+
+          // Cancel is chain is turned off by user
+          if (chainState && chainState.manualTurnOff) {
+            continue;
+          }
+          if (existedKey && !((_currentAssetSettings2 = currentAssetSettings[existedKey]) !== null && _currentAssetSettings2 !== void 0 && _currentAssetSettings2.visible)) {
+            needEnableChains.push(chainSlug);
+            needActiveTokens.push(existedKey);
+            currentAssetSettings[existedKey] = {
+              visible: true
+            };
+          }
+        }
+      }
+    }
     if (needActiveTokens.length) {
       await this.state.chainService.enableChains(needEnableChains);
       this.state.chainService.setAssetSettings({

package/services/chain-service/constants.js

@@ -278,7 +278,7 @@ export const _XCM_CHAIN_GROUP = {
   // default is xTokens pallet
 };
 
-export const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub'];
+export const SUFFICIENT_CHAIN = ['astar', 'calamari', 'parallel', 'darwinia2', 'crabParachain', 'pangolin', 'statemint', 'moonriver', 'shiden', 'moonbeam', 'statemine', 'liberland', 'dentnet', 'phala', 'crust', 'dbcchain', 'rococo_assethub', 'hydradx_main'];
 export const _XCM_TYPE = {
   RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
   // DMP

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

@@ -121,7 +121,7 @@ export declare class ChainService {
     enableChain(chainSlug: string): Promise<boolean>;
     enableChains(chainSlugs: string[]): Promise<boolean>;
     reconnectChain(chain: string): Promise<boolean>;
-    disableChain(chainSlug: string): boolean;
+    disableChain(chainSlug: string, preventManualTurnOff?: boolean): boolean;
     private checkExistedPredefinedChain;
     private fetchLatestChainData;
     private fetchLatestPriceIdsData;

package/services/chain-service/index.js

@@ -822,7 +822,7 @@ export class ChainService {
     await ((_this$getEvmApi = this.getEvmApi(chain)) === null || _this$getEvmApi === void 0 ? void 0 : _this$getEvmApi.recoverConnect());
     return true;
   }
-  disableChain(chainSlug) {
+  disableChain(chainSlug, preventManualTurnOff = false) {
     const chainInfo = this.getChainInfoByKey(chainSlug);
     const chainStateMap = this.getChainStateMap();
     if (!chainStateMap[chainSlug].active || this.lockChainInfoMap) {
@@ -830,7 +830,7 @@ export class ChainService {
     }
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
-    chainStateMap[chainSlug].manualTurnOff = true;
+    chainStateMap[chainSlug].manualTurnOff = !preventManualTurnOff;
     // Set disconnect state for inactive chain
     this.updateChainConnectionStatus(chainSlug, _ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
@@ -838,7 +838,7 @@ export class ChainService {
       ...chainInfo,
       active: false,
       currentProvider: chainStateMap[chainSlug].currentProvider,
-      manualTurnOff: true
+      manualTurnOff: !preventManualTurnOff
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
@@ -1742,7 +1742,7 @@ export class ChainService {
       const activeChains = this.getActiveChainInfos();
       for (const chain of Object.keys(activeChains)) {
         if (!_DEFAULT_ACTIVE_CHAINS.includes(chain)) {
-          this.disableChain(chain);
+          this.disableChain(chain, true);
         }
       }