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

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;
@@ -257,6 +259,8 @@ export default class KoniExtension {
     private fetchInappNotifications;
     private getInappNotification;
     private submitClaimAvailBridge;
+    private getIsClaimedPolygonBridge;
+    private submitClaimPolygonBridge;
     private subscribeLedgerGenericAllowChains;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

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';
@@ -26,14 +26,14 @@ import { isBounceableAddress } from '@subwallet/extension-base/services/balance-
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject, getPSP34TransferExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createTransferExtrinsic, getTransferMockTxFee } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
-import { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createSnowBridgeExtrinsic, createXcmExtrinsic, getXcmMockTxFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+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 { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
+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, 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';
@@ -1178,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);
     };
@@ -1255,6 +1261,7 @@ export default class KoniExtension {
     const isAvailBridgeFromEvm = _isPureEvmChain(chainInfoMap[originNetworkKey]) && isAvailChainBridge(destinationNetworkKey);
     const isAvailBridgeFromAvail = isAvailChainBridge(originNetworkKey) && _isPureEvmChain(chainInfoMap[destinationNetworkKey]);
     const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
+    const isPolygonBridgeTransfer = _isPolygonChainBridge(originNetworkKey, destinationNetworkKey);
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
@@ -1271,7 +1278,9 @@ export default class KoniExtension {
         evmApi
       };
       let funcCreateExtrinsic;
-      if (isSnowBridgeEvmTransfer) {
+      if (isPolygonBridgeTransfer) {
+        funcCreateExtrinsic = createPolygonBridgeExtrinsic;
+      } else if (isSnowBridgeEvmTransfer) {
         funcCreateExtrinsic = createSnowBridgeExtrinsic;
       } else if (isAvailBridgeFromEvm) {
         funcCreateExtrinsic = createAvailBridgeTxFromEth;
@@ -1336,7 +1345,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
-      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm ? ChainType.SUBSTRATE : ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,
       isTransferAll: transferAll,
@@ -1462,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)) {
@@ -1491,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,
@@ -2611,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,
@@ -3375,7 +3411,7 @@ export default class KoniExtension {
       chain,
       notification
     } = data;
-    const extrinsicType = ExtrinsicType.CLAIM_AVAIL_BRIDGE;
+    const extrinsicType = ExtrinsicType.CLAIM_BRIDGE;
     let transaction = null;
     let chainType;
     if (isSubstrateAddress(address)) {
@@ -3396,6 +3432,32 @@ export default class KoniExtension {
       chainType
     });
   }
+  async getIsClaimedPolygonBridge(data) {
+    const evmApi = this.#koniState.getEvmApi(data.chainslug);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const isClaimed = await isClaimedPolygonBridge(data.chainslug, data.counter, data.sourceNetwork, evmApi);
+    return isClaimed;
+  }
+  async submitClaimPolygonBridge(data) {
+    const {
+      address,
+      chain,
+      notification
+    } = data;
+    const extrinsicType = ExtrinsicType.CLAIM_BRIDGE;
+    let transaction = null;
+    const evmApi = this.#koniState.getEvmApi(chain);
+    transaction = await getClaimPolygonBridge(chain, notification, evmApi);
+    const chainType = ChainType.EVM;
+    return await this.#koniState.transactionService.handleTransaction({
+      address,
+      chain,
+      transaction,
+      data,
+      extrinsicType,
+      chainType
+    });
+  }
 
   /* Ledger */
 
@@ -3983,6 +4045,8 @@ export default class KoniExtension {
         return this.fetchInappNotifications(request);
       case 'pri(inappNotification.get)':
         return this.getInappNotification(request);
+      case 'pri(inappNotification.isClaimedPolygonBridge)':
+        return this.getIsClaimedPolygonBridge(request);
       /* Notification service */
 
       /* Avail Bridge */
@@ -3990,6 +4054,13 @@ export default class KoniExtension {
         return this.submitClaimAvailBridge(request);
       /* Avail Bridge */
 
+      /* Polygon Bridge */
+
+      case 'pri(polygonBridge.submitClaimPolygonBridge)':
+        return this.submitClaimPolygonBridge(request);
+
+      /* Polygon Bridge */
+
       /* Ledger */
       case 'pri(ledger.generic.allow)':
         return this.subscribeLedgerGenericAllowChains(id, port);

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

@@ -6,6 +6,7 @@ import { EnvConfig } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import BuyService from '@subwallet/extension-base/services/buy-service';
 import CampaignService from '@subwallet/extension-base/services/campaign-service';
+import { ChainOnlineService } from '@subwallet/extension-base/services/chain-online-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest } from '@subwallet/extension-base/services/chain-service/types';
 import EarningService from '@subwallet/extension-base/services/earning-service/service';
@@ -76,6 +77,7 @@ export default class KoniState {
     readonly feeService: FeeService;
     readonly swapService: SwapService;
     readonly inappNotificationService: InappNotificationService;
+    readonly chainOnlineService: ChainOnlineService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;

package/koni/background/handlers/State.js

@@ -11,6 +11,7 @@ import { BalanceService } from '@subwallet/extension-base/services/balance-servi
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
 import CampaignService from '@subwallet/extension-base/services/campaign-service';
+import { ChainOnlineService } from '@subwallet/extension-base/services/chain-online-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getEvmChainId, _getSubstrateGenesisHash, _getTokenOnChainAssetId, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
@@ -105,6 +106,7 @@ export default class KoniState {
     this.feeService = new FeeService(this);
     this.swapService = new SwapService(this);
     this.inappNotificationService = new InappNotificationService(this.dbService, this.keyringService, this.eventService, this.chainService);
+    this.chainOnlineService = new ChainOnlineService(this.chainService, this.settingService, this.eventService, this.dbService);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -198,7 +200,6 @@ export default class KoniState {
   async init() {
     await this.eventService.waitCryptoReady;
     await this.chainService.init();
-    this.afterChainServiceInit();
     await this.migrationService.run();
     this.campaignService.init();
     this.mktCampaignService.init();
@@ -214,7 +215,11 @@ export default class KoniState {
     // TODO: consider moving this to a separate service
     await this.dbService.stores.crowdloan.removeEndedCrowdloans();
     await this.startSubscription();
+    this.chainOnlineService.checkLatestData();
     this.chainService.checkLatestData();
+    this.chainService.subscribeChainInfoMap().subscribe(() => {
+      this.afterChainServiceInit();
+    });
   }
   async initMantaPay(password) {
     var _this$chainService, _this$chainService$ma;
@@ -779,6 +784,7 @@ export default class KoniState {
     return this.chainService.stopAllChainApis();
   }
   async resumeAllNetworks() {
+    this.chainOnlineService.checkLatestData();
     return this.chainService.resumeAllChainApis();
   }
   publishCrowdloan(reset) {
@@ -1331,8 +1337,11 @@ export default class KoniState {
     this.chainService.resetWallet(resetAll);
     await this.walletConnectService.resetWallet(resetAll);
     await this.chainService.init();
-    this.afterChainServiceInit();
+    this.chainOnlineService.checkLatestData();
     this.chainService.checkLatestData();
+    this.chainService.subscribeChainInfoMap().subscribe(() => {
+      this.afterChainServiceInit();
+    });
   }
   async enableMantaPay(updateStore, address, password, seedPhrase) {
     var _this$chainService3, _this$chainService3$m, _this$chainService4, _this$chainService4$m, _this$chainService4$m2, _this$chainService11, _this$chainService11$, _this$chainService11$2;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.7-0",
+  "version": "1.3.9-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -271,6 +271,7 @@
     "./koni/api/contract-handler/utils/erc721_abi.json": "./koni/api/contract-handler/utils/erc721_abi.json",
     "./koni/api/contract-handler/utils/neuroguns_psp34_abi.json": "./koni/api/contract-handler/utils/neuroguns_psp34_abi.json",
     "./koni/api/contract-handler/utils/pink_psp34_abi.json": "./koni/api/contract-handler/utils/pink_psp34_abi.json",
+    "./koni/api/contract-handler/utils/polygon_bridge_abi.json": "./koni/api/contract-handler/utils/polygon_bridge_abi.json",
     "./koni/api/contract-handler/utils/psp22_abi.json": "./koni/api/contract-handler/utils/psp22_abi.json",
     "./koni/api/contract-handler/utils/psp34_abi.json": "./koni/api/contract-handler/utils/psp34_abi.json",
     "./koni/api/contract-handler/utils/snowbridge_gateway_abi.json": "./koni/api/contract-handler/utils/snowbridge_gateway_abi.json",
@@ -716,6 +717,11 @@
       "require": "./cjs/services/balance-service/transfer/xcm/polkadotXcm.js",
       "default": "./services/balance-service/transfer/xcm/polkadotXcm.js"
     },
+    "./services/balance-service/transfer/xcm/polygonBridge": {
+      "types": "./services/balance-service/transfer/xcm/polygonBridge.d.ts",
+      "require": "./cjs/services/balance-service/transfer/xcm/polygonBridge.js",
+      "default": "./services/balance-service/transfer/xcm/polygonBridge.js"
+    },
     "./services/balance-service/transfer/xcm/snowBridge": {
       "types": "./services/balance-service/transfer/xcm/snowBridge.d.ts",
       "require": "./cjs/services/balance-service/transfer/xcm/snowBridge.js",
@@ -776,6 +782,16 @@
       "require": "./cjs/services/campaign-service/types.js",
       "default": "./services/campaign-service/types.js"
     },
+    "./services/chain-online-service": {
+      "types": "./services/chain-online-service/index.d.ts",
+      "require": "./cjs/services/chain-online-service/index.js",
+      "default": "./services/chain-online-service/index.js"
+    },
+    "./services/chain-online-service/constants": {
+      "types": "./services/chain-online-service/constants.d.ts",
+      "require": "./cjs/services/chain-online-service/constants.js",
+      "default": "./services/chain-online-service/constants.js"
+    },
     "./services/chain-service": {
       "types": "./services/chain-service/index.d.ts",
       "require": "./cjs/services/chain-service/index.js",
@@ -1124,9 +1140,24 @@
       "default": "./services/inapp-notification-service/interfaces.js"
     },
     "./services/inapp-notification-service/utils": {
-      "types": "./services/inapp-notification-service/utils.d.ts",
-      "require": "./cjs/services/inapp-notification-service/utils.js",
-      "default": "./services/inapp-notification-service/utils.js"
+      "types": "./services/inapp-notification-service/utils/index.d.ts",
+      "require": "./cjs/services/inapp-notification-service/utils/index.js",
+      "default": "./services/inapp-notification-service/utils/index.js"
+    },
+    "./services/inapp-notification-service/utils/avail": {
+      "types": "./services/inapp-notification-service/utils/avail.d.ts",
+      "require": "./cjs/services/inapp-notification-service/utils/avail.js",
+      "default": "./services/inapp-notification-service/utils/avail.js"
+    },
+    "./services/inapp-notification-service/utils/common": {
+      "types": "./services/inapp-notification-service/utils/common.d.ts",
+      "require": "./cjs/services/inapp-notification-service/utils/common.js",
+      "default": "./services/inapp-notification-service/utils/common.js"
+    },
+    "./services/inapp-notification-service/utils/polygon": {
+      "types": "./services/inapp-notification-service/utils/polygon.d.ts",
+      "require": "./cjs/services/inapp-notification-service/utils/polygon.js",
+      "default": "./services/inapp-notification-service/utils/polygon.js"
     },
     "./services/keyring-service": {
       "types": "./services/keyring-service/index.d.ts",
@@ -1358,6 +1389,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistory.js",
       "default": "./services/migration-service/scripts/MigrateTransactionHistory.js"
     },
+    "./services/migration-service/scripts/MigrateTransactionHistoryBridge": {
+      "types": "./services/migration-service/scripts/MigrateTransactionHistoryBridge.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBridge.js",
+      "default": "./services/migration-service/scripts/MigrateTransactionHistoryBridge.js"
+    },
     "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol": {
       "types": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js",
@@ -1848,6 +1884,11 @@
       "require": "./cjs/stores/Base.js",
       "default": "./stores/Base.js"
     },
+    "./stores/ChainlistStore": {
+      "types": "./stores/ChainlistStore.d.ts",
+      "require": "./cjs/stores/ChainlistStore.js",
+      "default": "./stores/ChainlistStore.js"
+    },
     "./stores/CurrentAccountStore": {
       "types": "./stores/CurrentAccountStore.d.ts",
       "require": "./cjs/stores/CurrentAccountStore.js",
@@ -2008,16 +2049,16 @@
       "require": "./cjs/types/account/info/proxy.js",
       "default": "./types/account/info/proxy.js"
     },
-    "./types/avail-bridge": {
-      "types": "./types/avail-bridge/index.d.ts",
-      "require": "./cjs/types/avail-bridge/index.js",
-      "default": "./types/avail-bridge/index.js"
-    },
     "./types/balance": {
       "types": "./types/balance/index.d.ts",
       "require": "./cjs/types/balance/index.js",
       "default": "./types/balance/index.js"
     },
+    "./types/bridge": {
+      "types": "./types/bridge/index.d.ts",
+      "require": "./cjs/types/bridge/index.js",
+      "default": "./types/bridge/index.js"
+    },
     "./types/buy": {
       "types": "./types/buy.d.ts",
       "require": "./cjs/types/buy.js",
@@ -2450,11 +2491,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.95-beta.0",
-    "@subwallet/extension-base": "^1.3.7-0",
-    "@subwallet/extension-chains": "^1.3.7-0",
-    "@subwallet/extension-dapp": "^1.3.7-0",
-    "@subwallet/extension-inject": "^1.3.7-0",
+    "@subwallet/chain-list": "0.2.95-beta.1",
+    "@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",
@@ -2488,6 +2529,7 @@
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
     "sails-js": "^0.1.6",
+    "ts-md5": "^1.3.1",
     "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0",
     "web3": "^1.10.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.7-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/balance-service/transfer/xcm/index.d.ts

@@ -18,4 +18,5 @@ export declare const createSnowBridgeExtrinsic: ({ chainInfoMap, destinationToke
 export declare const createXcmExtrinsic: ({ chainInfoMap, destinationTokenInfo, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createAvailBridgeTxFromEth: ({ chainInfoMap, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createAvailBridgeExtrinsicFromAvail: ({ recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
+export declare const createPolygonBridgeExtrinsic: ({ chainInfoMap, destinationTokenInfo, evmApi, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const getXcmMockTxFee: (substrateApi: _SubstrateApi, chainInfoMap: Record<string, _ChainInfo>, originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset) => Promise<BigN>;

package/services/balance-service/transfer/xcm/index.js

@@ -1,9 +1,10 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { _isPolygonBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
+import { _createPolygonBridgeL1toL2Extrinsic, _createPolygonBridgeL2toL1Extrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
 import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet';
 import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens';
@@ -85,6 +86,33 @@ export const createAvailBridgeExtrinsicFromAvail = async ({
   }
   return await getAvailBridgeExtrinsicFromAvail(recipient, sendingValue, substrateApi);
 };
+export const createPolygonBridgeExtrinsic = async ({
+  chainInfoMap,
+  destinationTokenInfo,
+  evmApi,
+  originTokenInfo,
+  recipient,
+  sender,
+  sendingValue
+}) => {
+  const originChainInfo = chainInfoMap[originTokenInfo.originChain];
+  const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
+  if (!_isPolygonBridgeXcm(originChainInfo, destinationChainInfo)) {
+    throw new Error('This is not a valid PolygonBridge transfer');
+  }
+  if (!evmApi) {
+    throw Error('Evm API is not available');
+  }
+  if (!sender) {
+    throw Error('Sender is required');
+  }
+  const sourceChain = originChainInfo.slug;
+  if (sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm') {
+    return _createPolygonBridgeL2toL1Extrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
+  } else {
+    return _createPolygonBridgeL1toL2Extrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
+  }
+};
 export const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
   try {
     var _paymentInfo$partialF;