@subwallet/extension-base 1.3.8-0 → 1.3.9-0

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

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

@@ -17,6 +17,7 @@ var _utils2 = require("@subwallet/extension-base/utils");
 var _keyring = require("@subwallet/keyring");
 var _types2 = require("@subwallet/keyring/types");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
@@ -170,7 +171,10 @@ class BalanceService {
   }
 
   /** Subscribe token free balance of an address on chain */
-  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
+  async subscribeBalance(address, chain, tokenSlug) {
+    let balanceType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'transferable';
+    let extrinsicType = arguments.length > 4 ? arguments[4] : undefined;
+    let callback = arguments.length > 5 ? arguments[5] : undefined;
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
@@ -199,10 +203,18 @@ class BalanceService {
       let unsub = _util.noop;
       unsub = (0, _helpers.subscribeBalance)([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, result => {
         const rs = result[0];
+        let value;
+        switch (balanceType) {
+          case 'total':
+            value = new _bignumber.default(rs.free).plus(new _bignumber.default(rs.locked)).toFixed();
+            break;
+          default:
+            value = rs.free;
+        }
         if (rs.tokenSlug === tSlug && rs.state !== _KoniTypes.APIItemState.PENDING) {
           hasError = false;
           const balance = {
-            value: rs.free,
+            value,
             decimals: tokenInfo.decimals || 0,
             symbol: tokenInfo.symbol,
             metadata: rs.metadata
@@ -226,6 +238,12 @@ class BalanceService {
       }, 9999);
     });
   }
+  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, 'transferable', extrinsicType, callback);
+  }
+  async subscribeTotalBalance(address, chain, tokenSlug, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, 'total', extrinsicType, callback);
+  }
 
   /**
    * @public
@@ -242,6 +260,10 @@ class BalanceService {
     const [, balance] = await this.subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
+  async getTotalBalance(address, chain, tokenSlug, extrinsicType) {
+    const [, balance] = await this.subscribeTotalBalance(address, chain, tokenSlug, extrinsicType);
+    return balance;
+  }
 
   /** Remove balance from the subject object by addresses */
   removeBalanceByAddresses(addresses) {

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

@@ -15,6 +15,7 @@ var _utils2 = require("@subwallet/extension-base/koni/api/contract-handler/wasm/
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils3 = require("@subwallet/extension-base/services/fee-service/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
+var _i18next = require("i18next");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -88,11 +89,21 @@ async function getERC721Transaction(web3Api, chain, contractAddress, senderAddre
   var _priority$maxFeePerGa3, _priority$maxPriority3;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_utils._ERC721_ABI, contractAddress);
-  const [gasLimit, priority] = await Promise.all([
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
-    from: senderAddress
-  }), (0, _utils3.calculateGasFeeParams)(web3Api, chain)]);
+  let gasLimit;
+  let priority;
+  try {
+    [gasLimit, priority] = await Promise.all([
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
+      from: senderAddress
+    }), (0, _utils3.calculateGasFeeParams)(web3Api, chain)]);
+  } catch (e) {
+    const error = e;
+    if (error.message.includes('transfer to non ERC721Receiver implementer')) {
+      error.message = (0, _i18next.t)('Unable to send. NFT not supported on recipient address');
+    }
+    throw error;
+  }
   return {
     from: senderAddress,
     gasPrice: priority.gasPrice,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.SUFFICIENT_CHAIN = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -292,6 +292,8 @@ 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'];
+exports.SUFFICIENT_CHAIN = SUFFICIENT_CHAIN;
 const _XCM_TYPE = {
   RP: `${_types._SubstrateChainType.RELAYCHAIN}-${_types._SubstrateChainType.PARACHAIN}`,
   // DMP

package/cjs/types/transaction/error.js

@@ -50,4 +50,5 @@ exports.TransferTxErrorType = TransferTxErrorType;
   TransferTxErrorType["INVALID_TOKEN"] = "INVALID_TOKEN";
   TransferTxErrorType["TRANSFER_ERROR"] = "TRANSFER_ERROR";
   TransferTxErrorType["RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
+  TransferTxErrorType["RECEIVER_ACCOUNT_INACTIVE"] = "RECEIVER_ACCOUNT_INACTIVE";
 })(TransferTxErrorType || (exports.TransferTxErrorType = TransferTxErrorType = {}));

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

@@ -2,12 +2,13 @@ import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { _Address, AmountData, ExtrinsicType, FeeData } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
+import { FrameSystemAccountInfo } from '@subwallet/extension-base/core/substrate/types';
 import { _EvmApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';
 import { OptionalSWTransaction, SWTransactionInput, SWTransactionResponse } from '@subwallet/extension-base/services/transaction-service/types';
 import { KeyringPair } from '@subwallet/keyring/types';
 import BigN from 'bignumber.js';
 export declare function validateTransferRequest(tokenInfo: _ChainAsset, from: _Address, to: _Address, value: string | undefined, transferAll: boolean | undefined): [TransactionError[], KeyringPair | undefined, BigN | undefined];
-export declare function additionalValidateTransfer(tokenInfo: _ChainAsset, nativeTokenInfo: _ChainAsset, extrinsicType: ExtrinsicType, receiverTransferTokenFreeBalance: string, transferAmount: string, senderTransferTokenTransferable?: string, receiverNativeTransferable?: string): [TransactionWarning[], 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, BigN | 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;

package/core/logic-validation/transfer.js

@@ -5,10 +5,10 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { LEDGER_SIGNING_COMPATIBLE_MAP, SIGNING_COMPATIBLE_MAP, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
-import { _canAccountBeReaped } from '@subwallet/extension-base/core/substrate/system-pallet';
+import { _canAccountBeReaped, _isAccountActive } from '@subwallet/extension-base/core/substrate/system-pallet';
 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 { _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isNativeToken, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isNativeToken, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, TransferTxErrorType } from '@subwallet/extension-base/types';
@@ -43,44 +43,55 @@ export function validateTransferRequest(tokenInfo, from, to, value, transferAll)
   }
   return [errors, keypair, transferValue];
 }
-export function additionalValidateTransfer(tokenInfo, nativeTokenInfo, extrinsicType, receiverTransferTokenFreeBalance, transferAmount, senderTransferTokenTransferable, receiverNativeTransferable) {
-  const minAmount = _getTokenMinAmount(tokenInfo);
-  const nativeMinAmount = _getTokenMinAmount(nativeTokenInfo);
+export function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
+  const sendingTokenMinAmount = BigInt(_getTokenMinAmount(sendingTokenInfo));
+  const nativeTokenMinAmount = _getTokenMinAmount(nativeTokenInfo);
   const warnings = [];
   const errors = [];
-
-  // Check ed of not native token for sender after sending
-  if (extrinsicType === ExtrinsicType.TRANSFER_TOKEN && senderTransferTokenTransferable) {
-    if (new BigN(senderTransferTokenTransferable).minus(transferAmount).lt(minAmount)) {
+  const remainingSendingTokenOfSenderEnoughED = senderSendingTokenTransferable ? senderSendingTokenTransferable - transferAmount >= sendingTokenMinAmount : false;
+  const isReceiverAliveByNativeToken = receiverSystemAccountInfo ? _isAccountActive(receiverSystemAccountInfo) : false;
+  const isReceivingAmountPassED = receiverSendingTokenKeepAliveBalance + transferAmount >= sendingTokenMinAmount;
+  if (extrinsicType === ExtrinsicType.TRANSFER_TOKEN) {
+    if (!remainingSendingTokenOfSenderEnoughED) {
       const warning = new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT);
       warnings.push(warning);
     }
-  }
-
-  // Check ed for receiver before sending
-  if (extrinsicType === ExtrinsicType.TRANSFER_TOKEN && receiverNativeTransferable) {
-    if (new BigN(receiverNativeTransferable).lt(nativeMinAmount)) {
-      const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('The recipient account has {{amount}} {{nativeSymbol}} which can lead to your {{localSymbol}} being lost. Change recipient account and try again', {
+    if (!isReceiverAliveByNativeToken && !isSendingTokenSufficient) {
+      const balanceKeepAlive = formatNumber(nativeTokenMinAmount, _getAssetDecimals(nativeTokenInfo), balanceFormatter, {
+        maxNumberFormat: _getAssetDecimals(nativeTokenInfo) || 6
+      });
+      const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('The recipient account has less than {{amount}} {{nativeSymbol}}, which can lead to your {{localSymbol}} being lost. Change recipient account and try again', {
         replace: {
-          amount: receiverNativeTransferable,
+          amount: balanceKeepAlive,
           nativeSymbol: nativeTokenInfo.symbol,
-          localSymbol: tokenInfo.symbol
+          localSymbol: sendingTokenInfo.symbol
+        }
+      }));
+      errors.push(error);
+    }
+    if (!isReceivingAmountPassED) {
+      const atLeast = sendingTokenMinAmount - receiverSendingTokenKeepAliveBalance;
+      const atLeastStr = formatNumber(atLeast.toString(), _getAssetDecimals(sendingTokenInfo), balanceFormatter, {
+        maxNumberFormat: _getAssetDecimals(sendingTokenInfo) || 6
+      });
+      const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to avoid losing funds on the recipient account. Increase amount and try again', {
+        replace: {
+          amount: atLeastStr,
+          symbol: sendingTokenInfo.symbol
         }
       }));
       errors.push(error);
     }
   }
-
-  // Check ed for receiver after sending
-  if (new BigN(receiverTransferTokenFreeBalance).plus(transferAmount).lt(minAmount)) {
-    const atLeast = new BigN(minAmount).minus(receiverTransferTokenFreeBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
-    const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter, {
-      maxNumberFormat: tokenInfo.decimals || 6
+  if (!isReceivingAmountPassED) {
+    const atLeast = sendingTokenMinAmount - receiverSendingTokenKeepAliveBalance;
+    const atLeastStr = formatNumber(atLeast.toString(), _getAssetDecimals(sendingTokenInfo), balanceFormatter, {
+      maxNumberFormat: _getAssetDecimals(sendingTokenInfo) || 6
     });
-    const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
+    const error = new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the recipient account alive. Increase amount and try again', {
       replace: {
         amount: atLeastStr,
-        symbol: tokenInfo.symbol
+        symbol: sendingTokenInfo.symbol
       }
     }));
     errors.push(error);

package/core/substrate/system-pallet.js

@@ -20,7 +20,7 @@ export function _canAccountBeReaped(accountInfo) {
 }
 
 export function _isAccountActive(accountInfo) {
-  return accountInfo.providers === 0 && accountInfo.consumers === 0;
+  return !(accountInfo.consumers === 0 && accountInfo.providers === 0 && accountInfo.sufficients === 0);
 }
 export function _getSystemPalletTotalBalance(accountInfo) {
   if (isV1(accountInfo)) {

package/core/types.d.ts

@@ -23,4 +23,5 @@ export interface ValidateRecipientParams {
     account: AccountJson | null;
     actionType: ActionType;
     autoFormatValue?: boolean;
+    allowLedgerGenerics: string[];
 }

package/core/utils.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { LEDGER_GENERIC_ALLOW_NETWORKS } from '@subwallet/extension-base/core/consts';
 import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
 import { tonAddressInfo } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
 import { _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible } from '@subwallet/extension-base/services/chain-service/utils';
@@ -99,6 +98,7 @@ export function _isNotDuplicateAddress(validateRecipientParams) {
 export function _isSupportLedgerAccount(validateRecipientParams) {
   const {
     account,
+    allowLedgerGenerics,
     destChainInfo
   } = validateRecipientParams;
   if (account !== null && account !== void 0 && account.isHardware) {
@@ -113,7 +113,7 @@ export function _isSupportLedgerAccount(validateRecipientParams) {
     } else {
       // For ledger generic
       const ledgerCheck = ledgerMustCheckNetwork(account);
-      if (ledgerCheck !== 'unnecessary' && !LEDGER_GENERIC_ALLOW_NETWORKS.includes(destChainInfo.slug)) {
+      if (ledgerCheck !== 'unnecessary' && !allowLedgerGenerics.includes(destChainInfo.slug)) {
         return `Ledger ${ledgerCheck === 'polkadot' ? 'Polkadot' : 'Migration'} address is not supported for this transfer`;
       }
     }

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

@@ -129,9 +129,11 @@ export default class KoniExtension {
     private recoverDotSamaApi;
     private validateERC721Token;
     private upsertCustomToken;
+    private isSufficientToken;
     private deleteCustomAsset;
     private validateCustomAsset;
     private getAddressTransferableBalance;
+    private getAddressTotalBalance;
     private getMaxTransferable;
     private getXcmMaxTransferable;
     private getNativeTokenMaxTransferable;

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 { ALL_ACCOUNT_KEY, LATEST_SESSION, XCM_FEE_RATIO } from '@subwallet/extension-base/constants';
-import { additionalValidateTransfer, additionalValidateXcmTransfer, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
+import { additionalValidateTransferForRecipient, additionalValidateXcmTransfer, validateTransferRequest, validateXcmTransferRequest } from '@subwallet/extension-base/core/logic-validation/transfer';
 import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { getERC20SpendingApprovalTx } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
@@ -29,12 +29,11 @@ import { createTonTransaction } from '@subwallet/extension-base/services/balance
 import { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsic, getXcmMockTxFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
-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 { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _isAssetSmartContractNft, _isChainEvmCompatible, _isChainTonCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon } 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';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
@@ -1179,35 +1178,41 @@ export default class KoniExtension {
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     const additionalValidator = async inputTransaction => {
-      let senderTransferTokenTransferable;
-      let receiverNativeTransferable;
+      let senderSendingTokenTransferable;
+      let receiverSystemAccountInfo;
+      if (!_isChainSubstrateCompatible(chainInfo)) {
+        return undefined;
+      }
 
       // Check ed for sender
       if (!isTransferNativeToken) {
-        const [_senderTransferTokenTransferable, _receiverNativeTransferable] = await Promise.all([this.getAddressTransferableBalance({
+        const [_senderSendingTokenTransferable, _receiverNativeTotal] = await Promise.all([this.getAddressTransferableBalance({
           address: from,
           networkKey,
           token: tokenSlug,
           extrinsicType
-        }), this.getAddressTransferableBalance({
+        }), this.getAddressTotalBalance({
           address: to,
           networkKey,
           token: nativeTokenSlug,
           extrinsicType: ExtrinsicType.TRANSFER_BALANCE
         })]);
-        senderTransferTokenTransferable = _senderTransferTokenTransferable.value;
-        receiverNativeTransferable = _receiverNativeTransferable.value;
+        senderSendingTokenTransferable = BigInt(_senderSendingTokenTransferable.value);
+        receiverSystemAccountInfo = _receiverNativeTotal.metadata;
       }
       const {
-        value: receiverTransferTokenTransferable
-      } = await this.getAddressTransferableBalance({
+        value: _receiverSendingTokenKeepAliveBalance
+      } = await this.getAddressTotalBalance({
         address: to,
         networkKey,
         token: tokenSlug,
         extrinsicType
       }); // todo: shouldn't be just transferable, locked also counts
-
-      const [warnings, errors] = additionalValidateTransfer(transferTokenInfo, nativeTokenInfo, extrinsicType, receiverTransferTokenTransferable, transferAmount.value, senderTransferTokenTransferable, receiverNativeTransferable);
+      const receiverSendingTokenKeepAliveBalance = BigInt(_receiverSendingTokenKeepAliveBalance);
+      const amount = BigInt(transferAmount.value);
+      const substrateApi = this.#koniState.getSubstrateApi(networkKey);
+      const isSendingTokenSufficient = await this.isSufficientToken(transferTokenInfo, substrateApi);
+      const [warnings, errors] = additionalValidateTransferForRecipient(transferTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, amount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient);
       warnings.length && inputTransaction.warnings.push(...warnings);
       errors.length && inputTransaction.errors.push(...errors);
     };
@@ -1466,6 +1471,25 @@ export default class KoniExtension {
       };
     }
   }
+  async isSufficientToken(tokenInfo, substrateApi) {
+    let metadata;
+    if (SUFFICIENT_CHAIN.includes(tokenInfo.originChain) && tokenInfo.assetType !== _AssetType.NATIVE) {
+      const assetId = _isBridgedToken(tokenInfo) ? _getXcmAssetMultilocation(tokenInfo) : _getTokenOnChainAssetId(tokenInfo);
+      const queryParams = {
+        section: 'query',
+        module: 'foreignAssets',
+        method: 'asset',
+        args: [assetId]
+      };
+      if (!_isBridgedToken(tokenInfo)) {
+        queryParams.module = 'assets';
+      }
+      metadata = await substrateApi.makeRpcQuery(queryParams);
+    } else {
+      return false;
+    }
+    return metadata.isSufficient;
+  }
   async deleteCustomAsset(assetSlug) {
     const assetInfo = this.#koniState.getAssetBySlug(assetSlug);
     if (assetInfo && _isCustomAsset(assetSlug)) {
@@ -1495,6 +1519,14 @@ export default class KoniExtension {
     }
     return await this.#koniState.balanceService.getTransferableBalance(address, networkKey, token, extrinsicType);
   }
+  async getAddressTotalBalance({
+    address,
+    extrinsicType,
+    networkKey,
+    token
+  }) {
+    return await this.#koniState.balanceService.getTotalBalance(address, networkKey, token, extrinsicType);
+  }
   async getMaxTransferable({
     address,
     destChain,
@@ -2615,11 +2647,11 @@ export default class KoniExtension {
     });
     Object.entries(availableNamespaces).forEach(([key, namespace]) => {
       if (namespace.chains) {
-        const accounts = [];
-        const chains = uniqueStringArray(namespace.chains);
-        chains.forEach(chain => {
-          accounts.push(...selectedAccounts.filter(address => isEthereumAddress(address) === (key === WALLET_CONNECT_EIP155_NAMESPACE)).map(address => `${chain}:${address}`));
+        const accounts = selectedAccounts.filter(address => {
+          const [_namespace] = address.split(':');
+          return _namespace === key;
         });
+        const chains = uniqueStringArray(namespace.chains);
         namespaces[key] = {
           accounts,
           methods: namespace.methods,

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.8-0",
+  "version": "1.3.9-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2492,10 +2492,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.95-beta.1",
-    "@subwallet/extension-base": "^1.3.8-0",
-    "@subwallet/extension-chains": "^1.3.8-0",
-    "@subwallet/extension-dapp": "^1.3.8-0",
-    "@subwallet/extension-inject": "^1.3.8-0",
+    "@subwallet/extension-base": "^1.3.9-0",
+    "@subwallet/extension-chains": "^1.3.9-0",
+    "@subwallet/extension-dapp": "^1.3.9-0",
+    "@subwallet/extension-inject": "^1.3.9-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

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.8-0'
+  version: '1.3.9-0'
 };

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

@@ -47,7 +47,9 @@ export declare class BalanceService implements StoppableServiceInterface {
     getBalanceDetectCache(update: (value: DetectBalanceCache) => void): void;
     setBalanceDetectCache(addresses: string[]): void;
     /** Subscribe token free balance of an address on chain */
+    subscribeBalance(address: string, chain: string, tokenSlug: string | undefined, balanceType?: 'transferable' | 'total' | 'keepAlive', extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
     subscribeTransferableBalance(address: string, chain: string, tokenSlug: string | undefined, extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
+    subscribeTotalBalance(address: string, chain: string, tokenSlug: string | undefined, extrinsicType?: ExtrinsicType, callback?: (rs: AmountData) => void): Promise<[() => void, AmountData]>;
     /**
      * @public
      * @async
@@ -60,6 +62,7 @@ export declare class BalanceService implements StoppableServiceInterface {
      * @return {Promise<AmountData>} - Free token balance of address on chain
      */
     getTransferableBalance(address: string, chain: string, tokenSlug?: string, extrinsicType?: ExtrinsicType): Promise<AmountData>;
+    getTotalBalance(address: string, chain: string, tokenSlug?: string, extrinsicType?: ExtrinsicType): Promise<AmountData>;
     /** Remove balance from the subject object by addresses */
     removeBalanceByAddresses(addresses: string[]): void;
     /** Remove inactive asset from the balance map */

package/services/balance-service/index.js

@@ -13,6 +13,7 @@ import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwa
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
 import keyring from '@subwallet/ui-keyring';
+import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
@@ -164,7 +165,7 @@ export class BalanceService {
   }
 
   /** Subscribe token free balance of an address on chain */
-  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
+  async subscribeBalance(address, chain, tokenSlug, balanceType = 'transferable', extrinsicType, callback) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
@@ -193,10 +194,18 @@ export class BalanceService {
       let unsub = noop;
       unsub = subscribeBalance([address], [chain], [tSlug], assetMap, chainInfoMap, substrateApiMap, evmApiMap, tonApiMap, result => {
         const rs = result[0];
+        let value;
+        switch (balanceType) {
+          case 'total':
+            value = new BigN(rs.free).plus(new BigN(rs.locked)).toFixed();
+            break;
+          default:
+            value = rs.free;
+        }
         if (rs.tokenSlug === tSlug && rs.state !== APIItemState.PENDING) {
           hasError = false;
           const balance = {
-            value: rs.free,
+            value,
             decimals: tokenInfo.decimals || 0,
             symbol: tokenInfo.symbol,
             metadata: rs.metadata
@@ -220,6 +229,12 @@ export class BalanceService {
       }, 9999);
     });
   }
+  async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, 'transferable', extrinsicType, callback);
+  }
+  async subscribeTotalBalance(address, chain, tokenSlug, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, 'total', extrinsicType, callback);
+  }
 
   /**
    * @public
@@ -236,6 +251,10 @@ export class BalanceService {
     const [, balance] = await this.subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
+  async getTotalBalance(address, chain, tokenSlug, extrinsicType) {
+    const [, balance] = await this.subscribeTotalBalance(address, chain, tokenSlug, extrinsicType);
+    return balance;
+  }
 
   /** Remove balance from the subject object by addresses */
   removeBalanceByAddresses(addresses) {

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

@@ -8,6 +8,7 @@ import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/cont
 import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import BigN from 'bignumber.js';
+import { t } from 'i18next';
 export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
   var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
@@ -78,11 +79,21 @@ export async function getERC721Transaction(web3Api, chain, contractAddress, send
   var _priority$maxFeePerGa3, _priority$maxPriority3;
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_ERC721_ABI, contractAddress);
-  const [gasLimit, priority] = await Promise.all([
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
-    from: senderAddress
-  }), calculateGasFeeParams(web3Api, chain)]);
+  let gasLimit;
+  let priority;
+  try {
+    [gasLimit, priority] = await Promise.all([
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
+      from: senderAddress
+    }), calculateGasFeeParams(web3Api, chain)]);
+  } catch (e) {
+    const error = e;
+    if (error.message.includes('transfer to non ERC721Receiver implementer')) {
+      error.message = t('Unable to send. NFT not supported on recipient address');
+    }
+    throw error;
+  }
   return {
     from: senderAddress,
     gasPrice: priority.gasPrice,

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

@@ -82,6 +82,7 @@ export declare const _XCM_CHAIN_GROUP: {
     polkadotXcmSpecialCases: string[];
     xcmPallet: string[];
 };
+export declare const SUFFICIENT_CHAIN: string[];
 export declare const _XCM_TYPE: {
     RP: string;
     PP: string;

package/services/chain-service/constants.js

@@ -270,6 +270,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 _XCM_TYPE = {
   RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
   // DMP

package/types/transaction/error.d.ts

@@ -34,6 +34,7 @@ export declare enum TransferTxErrorType {
     NOT_ENOUGH_FEE = "NOT_ENOUGH_FEE",
     INVALID_TOKEN = "INVALID_TOKEN",
     TRANSFER_ERROR = "TRANSFER_ERROR",
-    RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"
+    RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT",
+    RECEIVER_ACCOUNT_INACTIVE = "RECEIVER_ACCOUNT_INACTIVE"
 }
 export declare type TransactionErrorType = BasicTxErrorType | TransferTxErrorType | StakingTxErrorType | YieldValidationStatus | SwapErrorType;

package/types/transaction/error.js

@@ -41,4 +41,5 @@ export let TransferTxErrorType;
   TransferTxErrorType["INVALID_TOKEN"] = "INVALID_TOKEN";
   TransferTxErrorType["TRANSFER_ERROR"] = "TRANSFER_ERROR";
   TransferTxErrorType["RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
+  TransferTxErrorType["RECEIVER_ACCOUNT_INACTIVE"] = "RECEIVER_ACCOUNT_INACTIVE";
 })(TransferTxErrorType || (TransferTxErrorType = {}));