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

package/cjs/services/inapp-notification-service/utils/avail.js

@@ -0,0 +1,88 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AvailBridgeSourceChain = exports.AVAIL_BRIDGE_INDEXER = exports.AVAIL_BRIDGE_API = void 0;
+exports.fetchAllAvailBridgeClaimable = fetchAllAvailBridgeClaimable;
+exports.fetchAvailBridgeTransactions = fetchAvailBridgeTransactions;
+exports.filterClaimableOfAddress = filterClaimableOfAddress;
+exports.getAvailBridgeClaimDescription = getAvailBridgeClaimDescription;
+var _interfaces = require("../interfaces");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/* Description */
+function getAvailBridgeClaimDescription(amount, symbol) {
+  return `${amount} ${symbol} ready to claim from ${symbol} cross-chain transfer. Click to claim now!`;
+}
+/* Description */
+
+// todo: can refactor utils and const of avail bridge to a new file. Also check in /transfer/xcm/availBridge.ts file
+
+const AVAIL_BRIDGE_INDEXER = {
+  AVAIL_MAINNET: 'https://bridge-indexer.avail.so',
+  AVAIL_TESTNET: 'https://turing-bridge-indexer.fra.avail.so'
+};
+exports.AVAIL_BRIDGE_INDEXER = AVAIL_BRIDGE_INDEXER;
+const AVAIL_BRIDGE_API = {
+  AVAIL_MAINNET: 'https://bridge-api.avail.so',
+  AVAIL_TESTNET: 'https://turing-bridge-api.fra.avail.so'
+};
+exports.AVAIL_BRIDGE_API = AVAIL_BRIDGE_API;
+let AvailBridgeSourceChain;
+exports.AvailBridgeSourceChain = AvailBridgeSourceChain;
+(function (AvailBridgeSourceChain) {
+  AvailBridgeSourceChain["AVAIL"] = "AVAIL";
+  AvailBridgeSourceChain["ETHEREUM"] = "ETHEREUM";
+})(AvailBridgeSourceChain || (exports.AvailBridgeSourceChain = AvailBridgeSourceChain = {}));
+async function fetchAllAvailBridgeClaimable(address, sourceChain, isTestnet) {
+  const transactions = [];
+  let isContinue = true;
+  let page = 0;
+  const pageSize = 100;
+  while (isContinue) {
+    const response = await fetchAvailBridgeTransactions(address, sourceChain, _interfaces.BridgeTransactionStatus.READY_TO_CLAIM, pageSize, page, isTestnet);
+    if (!response) {
+      break;
+    }
+    transactions.push(...filterClaimableOfAddress(address, response.data.result));
+    isContinue = response.data.paginationData.hasNextPage;
+    page = page + 1;
+  }
+  return transactions;
+}
+async function fetchAvailBridgeTransactions(userAddress, sourceChain, status) {
+  let pageSize = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 100;
+  let page = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  let isTestnet = arguments.length > 5 ? arguments[5] : undefined;
+  const params = new URLSearchParams({
+    userAddress,
+    sourceChain,
+    status,
+    pageSize: pageSize.toString(),
+    page: page.toString()
+  });
+  try {
+    const api = isTestnet ? AVAIL_BRIDGE_INDEXER.AVAIL_TESTNET : AVAIL_BRIDGE_INDEXER.AVAIL_MAINNET;
+    const rawResponse = await fetch(`${api}/transactions?${params.toString()}`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*'
+      },
+      credentials: 'omit'
+    });
+    if (!rawResponse.ok) {
+      console.error('Error fetching claimable bridge transactions');
+      return undefined;
+    }
+    return await rawResponse.json();
+  } catch (e) {
+    console.error(e);
+    return undefined;
+  }
+}
+function filterClaimableOfAddress(address, transactions) {
+  return transactions.filter(transaction => transaction.receiverAddress.toLowerCase() === address.toLowerCase());
+}

package/cjs/services/inapp-notification-service/{utils.js → utils/common.js}

@@ -3,13 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AvailBridgeTransactionStatus = exports.AvailBridgeSourceChain = exports.AVAIL_BRIDGE_INDEXER = exports.AVAIL_BRIDGE_API = void 0;
 exports.createClaimNotification = createClaimNotification;
 exports.createWithdrawNotifications = createWithdrawNotifications;
-exports.fetchAllAvailBridgeClaimable = fetchAllAvailBridgeClaimable;
-exports.fetchAvailBridgeTransactions = fetchAvailBridgeTransactions;
-exports.filterClaimableOfAddress = filterClaimableOfAddress;
-exports.getAvailBridgeClaimDescription = getAvailBridgeClaimDescription;
 exports.getClaimDescription = getClaimDescription;
 exports.getIsTabRead = getIsTabRead;
 exports.getReceiveDescription = getReceiveDescription;
@@ -41,9 +36,7 @@ function getSendDescription(amount, symbol) {
 function getReceiveDescription(amount, symbol) {
   return `You have just received ${amount} ${symbol}`;
 }
-function getAvailBridgeClaimDescription(amount, symbol) {
-  return `${amount} ${symbol} ready to claim from ${symbol} cross-chain transfer. Click to claim now!`;
-}
+
 /* Description */
 
 function getIsTabRead(notificationTab) {
@@ -116,82 +109,6 @@ function createClaimNotification(claimItemInfo, tokenInfo) {
     }
   };
 }
-
-// todo: can refactor utils and const of avail bridge to a new file. Also check in /transfer/xcm/availBridge.ts file
-
-const AVAIL_BRIDGE_INDEXER = {
-  AVAIL_MAINNET: 'https://bridge-indexer.avail.so',
-  AVAIL_TESTNET: 'https://turing-bridge-indexer.fra.avail.so'
-};
-exports.AVAIL_BRIDGE_INDEXER = AVAIL_BRIDGE_INDEXER;
-const AVAIL_BRIDGE_API = {
-  AVAIL_MAINNET: 'https://bridge-api.avail.so',
-  AVAIL_TESTNET: 'https://turing-bridge-api.fra.avail.so'
-};
-exports.AVAIL_BRIDGE_API = AVAIL_BRIDGE_API;
-let AvailBridgeTransactionStatus;
-exports.AvailBridgeTransactionStatus = AvailBridgeTransactionStatus;
-(function (AvailBridgeTransactionStatus) {
-  AvailBridgeTransactionStatus["READY_TO_CLAIM"] = "READY_TO_CLAIM";
-  AvailBridgeTransactionStatus["CLAIMED"] = "CLAIMED";
-  AvailBridgeTransactionStatus["BRIDGED"] = "BRIDGED";
-})(AvailBridgeTransactionStatus || (exports.AvailBridgeTransactionStatus = AvailBridgeTransactionStatus = {}));
-let AvailBridgeSourceChain;
-exports.AvailBridgeSourceChain = AvailBridgeSourceChain;
-(function (AvailBridgeSourceChain) {
-  AvailBridgeSourceChain["AVAIL"] = "AVAIL";
-  AvailBridgeSourceChain["ETHEREUM"] = "ETHEREUM";
-})(AvailBridgeSourceChain || (exports.AvailBridgeSourceChain = AvailBridgeSourceChain = {}));
-async function fetchAllAvailBridgeClaimable(address, sourceChain, isTestnet) {
-  const transactions = [];
-  let isContinue = true;
-  let page = 0;
-  const pageSize = 100;
-  while (isContinue) {
-    const response = await fetchAvailBridgeTransactions(address, sourceChain, AvailBridgeTransactionStatus.READY_TO_CLAIM, pageSize, page, isTestnet);
-    if (!response) {
-      break;
-    }
-    transactions.push(...filterClaimableOfAddress(address, response.data.result));
-    isContinue = response.data.paginationData.hasNextPage;
-    page = page + 1;
-  }
-  return transactions;
-}
-async function fetchAvailBridgeTransactions(userAddress, sourceChain, status) {
-  let pageSize = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 100;
-  let page = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
-  let isTestnet = arguments.length > 5 ? arguments[5] : undefined;
-  const params = new URLSearchParams({
-    userAddress,
-    sourceChain,
-    status,
-    pageSize: pageSize.toString(),
-    page: page.toString()
-  });
-  try {
-    const api = isTestnet ? AVAIL_BRIDGE_INDEXER.AVAIL_TESTNET : AVAIL_BRIDGE_INDEXER.AVAIL_MAINNET;
-    const rawResponse = await fetch(`${api}/transactions?${params.toString()}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        'Access-Control-Allow-Origin': '*'
-      },
-      credentials: 'omit'
-    });
-    if (!rawResponse.ok) {
-      console.error('Error fetching claimable bridge transactions');
-      return undefined;
-    }
-    return await rawResponse.json();
-  } catch (e) {
-    console.error(e);
-    return undefined;
-  }
-}
-function filterClaimableOfAddress(address, transactions) {
-  return transactions.filter(transaction => transaction.receiverAddress.toLowerCase() === address.toLowerCase());
-}
 function hrsToMillisecond(hours) {
   return hours * 60 * 60 * 1000;
 }

package/cjs/services/inapp-notification-service/utils/index.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _avail = require("./avail");
+Object.keys(_avail).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _avail[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _avail[key];
+    }
+  });
+});
+var _common = require("./common");
+Object.keys(_common).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _common[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _common[key];
+    }
+  });
+});
+var _polygon = require("./polygon");
+Object.keys(_polygon).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _polygon[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _polygon[key];
+    }
+  });
+});

package/cjs/services/inapp-notification-service/utils/polygon.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.POLYGON_BRIDGE_INDEXER = void 0;
+exports.fetchAndFilterPolygonTransactionById = fetchAndFilterPolygonTransactionById;
+exports.fetchPolygonBridgeTransactions = fetchPolygonBridgeTransactions;
+exports.getPolygonBridgeClaimDescription = getPolygonBridgeClaimDescription;
+var _interfaces = require("../interfaces");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const POLYGON_BRIDGE_INDEXER = {
+  MAINNET: 'https://api-gateway.polygon.technology/api/v3/transactions/mainnet',
+  TESTNET: 'https://api-gateway.polygon.technology/api/v3/transactions/testnet'
+};
+exports.POLYGON_BRIDGE_INDEXER = POLYGON_BRIDGE_INDEXER;
+/* Description */
+function getPolygonBridgeClaimDescription(amount, symbol) {
+  return `${amount} ${symbol} ready to claim from ${symbol} cross-chain transfer. Click to claim now!`;
+}
+/* Description */
+
+async function fetchPolygonBridgeTransactions(userAddress, isTestnet) {
+  let pageSize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 500;
+  let page = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  const params = new URLSearchParams({
+    userAddress,
+    pageSize: pageSize.toString(),
+    page: page.toString()
+  });
+  const networkIds = [0, 1];
+  networkIds.forEach(networkId => {
+    params.append('destinationNetworkIds', networkId.toString());
+    params.append('sourceNetworkIds', networkId.toString());
+    params.append('status', _interfaces.BridgeTransactionStatus.READY_TO_CLAIM);
+  });
+  try {
+    const domain = isTestnet ? POLYGON_BRIDGE_INDEXER.TESTNET : POLYGON_BRIDGE_INDEXER.MAINNET;
+    const rawResponse = await fetch(`${domain}?${params.toString()}`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+        'x-api-key': 'polygonag_4RFN-g_wt2o12GmK9WWOWrGf-4Hamhtd'
+      },
+      credentials: 'omit'
+    });
+    if (!rawResponse.ok) {
+      console.error('Error fetching claimable bridge transactions');
+      return undefined;
+    }
+    return await rawResponse.json();
+  } catch (e) {
+    console.error(e);
+    return undefined;
+  }
+}
+async function fetchAndFilterPolygonTransactionById(transactionId, userAddress, isTestnet) {
+  const response = await fetchPolygonBridgeTransactions(userAddress, isTestnet);
+  if (!response || !response.success) {
+    return undefined;
+  }
+  return response.result.find(tx => tx._id === transactionId);
+}

package/cjs/services/migration-service/scripts/MigrateTransactionHistoryBridge.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _dexie = _interopRequireDefault(require("dexie"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateTransactionHistoryBridge extends _Base.default {
+  async run() {
+    const state = this.state;
+    const newTransactionItems = [];
+    try {
+      const db = new _dexie.default('SubWalletDB_v2');
+      const dexieDB = await db.open();
+      const transactionTable = dexieDB.table('transactions');
+      const oldTransactionData = await transactionTable.toArray();
+      const claimAvailBridgeTransactions = oldTransactionData.filter(item => item.type === 'claim.claim_avail_bridge');
+      claimAvailBridgeTransactions.forEach(item => {
+        const newItem = {
+          ...item,
+          type: _KoniTypes.ExtrinsicType.CLAIM_BRIDGE
+        };
+        newTransactionItems.push(newItem);
+      });
+      await state.dbService.upsertHistory(newTransactionItems);
+    } catch (e) {
+      this.logger.error(e);
+    }
+  }
+}
+exports.default = MigrateTransactionHistoryBridge;

package/cjs/services/migration-service/scripts/index.js

@@ -31,6 +31,7 @@ var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSe
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
+var _MigrateTransactionHistoryBridge = _interopRequireDefault(require("./MigrateTransactionHistoryBridge"));
 var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol"));
 var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -67,7 +68,8 @@ var _default = {
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
   '1.2.13-01': _ReloadMetadata.default,
   '1.2.14-01': _ClearMetadataDatabase.default,
-  '1.2.32-01': _MigratePairData.default
+  '1.2.32-01': _MigratePairData.default,
+  '1.3.6-01': _MigrateTransactionHistoryBridge.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/cjs/services/setting-service/SettingService.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _constants = require("@subwallet/extension-base/constants");
 var _Environment = require("@subwallet/extension-base/services/environment-service/stores/Environment");
 var _storage = require("@subwallet/extension-base/storage");
+var _ChainlistStore = _interopRequireDefault(require("@subwallet/extension-base/stores/ChainlistStore"));
 var _PassPhishingStore = _interopRequireDefault(require("@subwallet/extension-base/stores/PassPhishingStore"));
 var _Settings = _interopRequireDefault(require("@subwallet/extension-base/stores/Settings"));
 var _i18n = _interopRequireDefault(require("./i18n/i18n"));
@@ -18,6 +19,7 @@ var _constants2 = require("./constants");
 class SettingService {
   settingsStore = new _Settings.default();
   passPhishingStore = new _PassPhishingStore.default();
+  chainlistStore = new _ChainlistStore.default();
   environmentStore = new _Environment.EnvironmentStoreSubject();
   constructor() {
     this.initSetting().catch(console.error);
@@ -71,6 +73,12 @@ class SettingService {
   setPassPhishing(data, callback) {
     this.passPhishingStore.set('PassPhishing', data, callback);
   }
+  getChainlistSetting() {
+    return this.chainlistStore.asyncGet('Chainlist');
+  }
+  setChainlist(data, callback) {
+    this.chainlistStore.set('Chainlist', data, callback);
+  }
   getEnvironmentSetting() {
     return this.environmentStore.subject.value;
   }

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

@@ -38,7 +38,8 @@ const DEFAULT_NOTIFICATION_SETUP = {
     // receive: true,
     earningClaim: true,
     earningWithdraw: true,
-    availBridgeClaim: true
+    availBridgeClaim: true,
+    polygonBridgeClaim: true
     // isHideWithdraw: false, // todo: just for test, remove later
     // isHideMarketing: false,
     // isHideAnnouncement: false

package/cjs/services/storage-service/DatabaseService.js

@@ -343,6 +343,9 @@ class DatabaseService {
   async updateAssetStore(item) {
     return this.stores.asset.upsert(item);
   }
+  async bulkUpdateAssetsStore(items) {
+    return this.stores.asset.bulkUpsert(items);
+  }
   async getAllAssetStore() {
     return this.stores.asset.getAll();
   }

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

@@ -592,7 +592,7 @@ class TransactionService {
           historyItem.additionalInfo = data;
           break;
         }
-      case _KoniTypes.ExtrinsicType.CLAIM_AVAIL_BRIDGE:
+      case _KoniTypes.ExtrinsicType.CLAIM_BRIDGE:
         {
           const data = (0, _utils3.parseTransactionData)(transaction.data); // TODO: switch by provider
           const metadata = data.notification.metadata;

package/cjs/stores/ChainlistStore.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defaults = require("@subwallet/extension-base/defaults");
+var _SubscribableStore = _interopRequireDefault(require("@subwallet/extension-base/stores/SubscribableStore"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+class ChainlistStore extends _SubscribableStore.default {
+  constructor() {
+    super(_defaults.EXTENSION_PREFIX ? `${_defaults.EXTENSION_PREFIX}chainlist` : null);
+  }
+}
+exports.default = ChainlistStore;

package/cjs/types/index.js

@@ -25,6 +25,17 @@ Object.keys(_balance).forEach(function (key) {
     }
   });
 });
+var _bridge = require("./bridge");
+Object.keys(_bridge).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _bridge[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _bridge[key];
+    }
+  });
+});
 var _buy = require("./buy");
 Object.keys(_buy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

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/cjs/utils/account/transform.js

@@ -145,7 +145,7 @@ const EARN_QDOT_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_QDOT, _KoniTypes.Extrin
 const EARN_STDOT_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_STDOT, _KoniTypes.ExtrinsicType.REDEEM_STDOT, _KoniTypes.ExtrinsicType.UNSTAKE_STDOT];
 const EARN_VMANTA_ACTIONS = [_KoniTypes.ExtrinsicType.MINT_VMANTA, _KoniTypes.ExtrinsicType.REDEEM_VMANTA, _KoniTypes.ExtrinsicType.UNSTAKE_VMANTA];
 const EVM_ACTIONS = [_KoniTypes.ExtrinsicType.TOKEN_SPENDING_APPROVAL, _KoniTypes.ExtrinsicType.EVM_EXECUTE];
-const CLAIM_AVAIL_BRIDGE = [_KoniTypes.ExtrinsicType.CLAIM_AVAIL_BRIDGE];
+const CLAIM_AVAIL_BRIDGE = [_KoniTypes.ExtrinsicType.CLAIM_BRIDGE];
 const OTHER_ACTIONS = [_KoniTypes.ExtrinsicType.TRANSFER_XCM, _KoniTypes.ExtrinsicType.SEND_NFT, _KoniTypes.ExtrinsicType.SWAP, _KoniTypes.ExtrinsicType.CROWDLOAN];
 const getAccountTransactionActions = (signMode, networkType, type, _meta, _specialNetwork) => {
   if ([_types2.AccountSignMode.PASSWORD, _types2.AccountSignMode.INJECTED].includes(signMode)) {

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/substrate/xcm-parser.d.ts

@@ -53,4 +53,5 @@ export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, d
 export declare function _isSnowBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isAvailBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isMythosFromHydrationToMythos(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
+export declare function _isPolygonBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _adaptX1Interior(_assetIdentifier: Record<string, any>, version: number): Record<string, any>;