@subwallet/extension-base 1.1.40-0 → 1.1.41-0

package/cjs/utils/reportError.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.reportError = void 0;
+var _environment = require("@subwallet/extension-base/utils/environment");
+var _crossFetch = _interopRequireDefault(require("cross-fetch"));
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const EXTENSION_REPORT_ERROR_URL = 'https://extension-feedback.subwallet.app/gelf';
+const WEBAPP_REPORT_ERROR_URL = 'https://web-feedback.subwallet.app/gelf';
+const reportError = async (e, pathName) => {
+  const errorContent = JSON.stringify(e.stack);
+  const errorShortMessage = e.message;
+  const body = {
+    content: errorContent,
+    short_message: errorShortMessage,
+    platform: _environment.TARGET_ENV,
+    device_version: '',
+    app_version: JSON.stringify(process.env.PKG_VERSION),
+    current_routes: pathName
+  };
+  await (0, _crossFetch.default)(_environment.TARGET_ENV === 'extension' ? EXTENSION_REPORT_ERROR_URL : WEBAPP_REPORT_ERROR_URL, {
+    method: 'POST',
+    body: JSON.stringify(body)
+  });
+};
+exports.reportError = reportError;

package/constants/index.d.ts

@@ -11,7 +11,7 @@ export declare const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
 export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
 export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export declare const CRON_GET_API_MAP_STATUS = 10000;
-export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
+export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 90000;
 export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export declare const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export declare const CRON_SYNC_MANTA_PAY = 300000;

package/constants/index.js

@@ -14,7 +14,7 @@ export const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
 export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 90000;
 export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export const CRON_GET_API_MAP_STATUS = 10000;
-export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
+export const CRON_REFRESH_CHAIN_STAKING_METADATA = 90000;
 export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export const CRON_RECOVER_HISTORY_INTERVAL = 30000;
 export const CRON_SYNC_MANTA_PAY = 300000;

package/constants/staking.js

@@ -4,7 +4,7 @@
 export const PREDEFINED_STAKING_POOL = {
   kusama: 80,
   polkadot: 39,
-  vara_network: 29,
+  vara_network: 50,
   aleph: 82
 };
 export const MAX_NOMINATIONS = '16';

package/koni/api/dotsama/transfer.js

@@ -181,7 +181,7 @@ export const createTransferExtrinsic = async ({
   } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
-    if (networkKey === 'invarch') {
+    if (_TRANSFER_CHAIN_GROUP.disable_transfer.includes(networkKey)) {
       return [null, transferAmount || value];
     }
     if (transferAll) {

package/koni/api/nft/bit.country/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { BIT_COUNTRY_IPFS_SERVER, BIT_COUNTRY_LAND_ESTATE_METADATA_API } from '@subwallet/extension-base/koni/api/nft/config';
+import { BIT_AVATAR_API, BIT_COUNTRY_IPFS_SERVER, BIT_COUNTRY_LAND_ESTATE_METADATA_API } from '@subwallet/extension-base/koni/api/nft/config';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
@@ -53,6 +53,8 @@ export class BitCountryNftApi extends BaseNftApi {
     // check if NFT is Land/Estate
     if (onChainMeta.data.attributes['MetaverseId:']) {
       return await fetch(`${BIT_COUNTRY_LAND_ESTATE_METADATA_API}/${assetId.classId}/${assetId.tokenId}/metadata.json`).then(resp => resp.json());
+    } else if (onChainMeta.metadata.startsWith('/avatar/')) {
+      return await fetch(BIT_AVATAR_API + onChainMeta.metadata).then(resp => resp.json());
     } else {
       return await fetch(BIT_COUNTRY_IPFS_SERVER + onChainMeta.metadata).then(resp => resp.json());
     }

package/koni/api/nft/config.d.ts

@@ -7,6 +7,7 @@ export declare const SINGULAR_V2_COLLECTION_ENDPOINT = "https://singular.app/api
 export declare const KANARIA_EXTERNAL_SERVER = "https://kanaria.rmrk.app/catalogue/";
 export declare const CLOUDFLARE_PINATA_SERVER = "https://cloudflare-ipfs.com/ipfs/";
 export declare const BIT_COUNTRY_IPFS_SERVER = "https://ipfs-cdn.bit.country/";
+export declare const BIT_AVATAR_API = "https://api.bitavatar.io/v1";
 export declare const BIT_COUNTRY_LAND_ESTATE_METADATA_API = "https://pioneer-api.bit.country/metadata/landTokenUriPioneer";
 export declare const BIT_COUNTRY_THUMBNAIL_RESOLVER = "https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/";
 export declare const CF_IPFS_GATEWAY = "https://cf-ipfs.com/ipfs/";

package/koni/api/nft/config.js

@@ -13,6 +13,7 @@ export const SINGULAR_V2_COLLECTION_ENDPOINT = 'https://singular.app/api/rmrk2/c
 export const KANARIA_EXTERNAL_SERVER = 'https://kanaria.rmrk.app/catalogue/';
 export const CLOUDFLARE_PINATA_SERVER = 'https://cloudflare-ipfs.com/ipfs/';
 export const BIT_COUNTRY_IPFS_SERVER = 'https://ipfs-cdn.bit.country/';
+export const BIT_AVATAR_API = 'https://api.bitavatar.io/v1';
 export const BIT_COUNTRY_LAND_ESTATE_METADATA_API = 'https://pioneer-api.bit.country/metadata/landTokenUriPioneer';
 export const BIT_COUNTRY_THUMBNAIL_RESOLVER = 'https://res.cloudinary.com/ddftctzph/image/upload/c_scale,q_100,w_250/production-ipfs/asset/';
 

package/koni/api/tokens/evm/transfer.js

@@ -5,7 +5,7 @@ import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/backgrou
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { _BALANCE_PARSING_CHAIN_GROUP, EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
-import { calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import BigN from 'bignumber.js';
 import { hexToBn } from '@polkadot/util';
 export const handleTransferBalanceResult = ({

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

@@ -185,6 +185,7 @@ export default class KoniExtension {
     private getListDeriveAccounts;
     private subscribeChainInfoMap;
     private subscribeChainStateMap;
+    private subscribeChainStatusMap;
     private subscribeAssetRegistry;
     private subscribeMultiChainAssetMap;
     private subscribeXcmRefMap;

package/koni/background/handlers/Extension.js

@@ -26,14 +26,14 @@ import { YIELD_EXTRINSIC_TYPES } from '@subwallet/extension-base/koni/api/yield/
 import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { 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 { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
-import { convertSubjectInfoToAddresses, isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
-import { calculateGasFeeParams, createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
+import { convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
@@ -3169,6 +3169,19 @@ export default class KoniExtension {
     });
     return this.#koniState.getChainStateMap();
   }
+  subscribeChainStatusMap(id, port) {
+    const cb = createSubscription(id, port);
+    const chainStateMapSubscription = this.#koniState.chainService.subscribeChainStatusMap().subscribe({
+      next: rs => {
+        cb(rs);
+      }
+    });
+    this.createUnsubscriptionHandle(id, chainStateMapSubscription.unsubscribe);
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.chainService.getChainStatusMap();
+  }
   async subscribeAssetRegistry(id, port) {
     const cb = createSubscription(id, port);
     let ready = false;
@@ -3458,7 +3471,7 @@ export default class KoniExtension {
       });
       const {
         connectionStatus
-      } = this.#koniState.chainService.getChainStateByKey(_DEFAULT_MANTA_ZK_CHAIN);
+      } = this.#koniState.chainService.getChainStatusByKey(_DEFAULT_MANTA_ZK_CHAIN);
       if (connectionStatus !== _ChainConnectionStatus.CONNECTED) {
         // TODO: do better
         await timeout();
@@ -4194,6 +4207,8 @@ export default class KoniExtension {
         return this.subscribeChainInfoMap(id, port);
       case 'pri(chainService.subscribeChainStateMap)':
         return this.subscribeChainStateMap(id, port);
+      case 'pri(chainService.subscribeChainStatusMap)':
+        return this.subscribeChainStatusMap(id, port);
       case 'pri(chainService.subscribeXcmRefMap)':
         return this.subscribeXcmRefMap(id, port);
       case 'pri(chainService.getSupportedContractTypes)':

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

@@ -9,6 +9,7 @@ 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';
 import { EventService } from '@subwallet/extension-base/services/event-service';
+import FeeService from '@subwallet/extension-base/services/fee-service/service';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import MigrationService from '@subwallet/extension-base/services/migration-service';
@@ -22,7 +23,7 @@ import DatabaseService from '@subwallet/extension-base/services/storage-service/
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
-import { BalanceItem, BalanceJson, BalanceMap } from '@subwallet/extension-base/types';
+import { BalanceItem, BalanceJson, BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
 import { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import SimpleKeyring from 'eth-simple-keyring';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -70,6 +71,7 @@ export default class KoniState {
     readonly campaignService: CampaignService;
     readonly buyService: BuyService;
     readonly earningService: EarningService;
+    readonly feeService: FeeService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;
@@ -223,6 +225,7 @@ export default class KoniState {
     checkPublicAndSecretKey({ publicKey, secretKey }: RequestCheckPublicAndSecretKey): ResponseCheckPublicAndSecretKey;
     getEthKeyring(address: string, password: string): Promise<SimpleKeyring>;
     evmSign(id: string, url: string, method: string, params: any, allowedAccounts: string[]): Promise<string | undefined>;
+    calculateAllGasFeeOnChain(activeEvmChains: string[], timeout?: number): Promise<Record<string, EvmFeeInfo | null>>;
     evmSendTransaction(id: string, url: string, networkKey: string, allowedAccounts: string[], transactionParams: EvmSendTransactionParams): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;

package/koni/background/handlers/State.js

@@ -16,6 +16,8 @@ import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _PREDEFINED_SINGLE_MODE
 import { _getEvmChainId, _getSubstrateGenesisHash, _getTokenOnChainAssetId, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import EarningService from '@subwallet/extension-base/services/earning-service/service';
 import { EventService } from '@subwallet/extension-base/services/event-service';
+import FeeService from '@subwallet/extension-base/services/fee-service/service';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import MigrationService from '@subwallet/extension-base/services/migration-service';
@@ -31,7 +33,6 @@ import TransactionService from '@subwallet/extension-base/services/transaction-s
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { addLazy, isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/utils/eth';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -104,6 +105,7 @@ export default class KoniState {
     this.buyService = new BuyService(this);
     this.transactionService = new TransactionService(this);
     this.earningService = new EarningService(this);
+    this.feeService = new FeeService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
     this.logger = createLogger('State');
@@ -1206,6 +1208,35 @@ export default class KoniState {
       }
     });
   }
+  async calculateAllGasFeeOnChain(activeEvmChains, timeout = 10000) {
+    const promiseList = [];
+    activeEvmChains.forEach(slug => {
+      const timeoutPromise = new Promise(resolve => {
+        setTimeout(() => resolve(null), timeout);
+      });
+      const promise = (async () => {
+        try {
+          const web3Api = this.chainService.getEvmApi(slug);
+          await web3Api.isReady;
+          return await calculateGasFeeParams(web3Api, slug, false, false);
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      })();
+      promiseList.push(Promise.race([promise, timeoutPromise]).then(result => {
+        var _result$gasPrice, _result$maxFeePerGas, _result$maxPriorityFe, _result$baseGasFee;
+        return [slug, result ? {
+          ...result,
+          gasPrice: (_result$gasPrice = result.gasPrice) === null || _result$gasPrice === void 0 ? void 0 : _result$gasPrice.toString(),
+          maxFeePerGas: (_result$maxFeePerGas = result.maxFeePerGas) === null || _result$maxFeePerGas === void 0 ? void 0 : _result$maxFeePerGas.toString(),
+          maxPriorityFeePerGas: (_result$maxPriorityFe = result.maxPriorityFeePerGas) === null || _result$maxPriorityFe === void 0 ? void 0 : _result$maxPriorityFe.toString(),
+          baseGasFee: (_result$baseGasFee = result.baseGasFee) === null || _result$baseGasFee === void 0 ? void 0 : _result$baseGasFee.toString()
+        } : null];
+      }));
+    });
+    return Object.fromEntries(await Promise.all(promiseList));
+  }
   async evmSendTransaction(id, url, networkKey, allowedAccounts, transactionParams) {
     const evmApi = this.getEvmApi(networkKey);
     const evmNetwork = this.getChainInfo(networkKey);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.40-0",
+  "version": "1.1.41-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -865,6 +865,16 @@
       "require": "./cjs/services/event-service/types.js",
       "default": "./services/event-service/types.js"
     },
+    "./services/fee-service/service": {
+      "types": "./services/fee-service/service.d.ts",
+      "require": "./cjs/services/fee-service/service.js",
+      "default": "./services/fee-service/service.js"
+    },
+    "./services/fee-service/utils": {
+      "types": "./services/fee-service/utils/index.d.ts",
+      "require": "./cjs/services/fee-service/utils/index.js",
+      "default": "./services/fee-service/utils/index.js"
+    },
     "./services/history-service": {
       "types": "./services/history-service/index.d.ts",
       "require": "./cjs/services/history-service/index.js",
@@ -945,6 +955,11 @@
       "require": "./cjs/services/migration-service/scripts/DeleteChain.js",
       "default": "./services/migration-service/scripts/DeleteChain.js"
     },
+    "./services/migration-service/scripts/DeleteChainStaking": {
+      "types": "./services/migration-service/scripts/DeleteChainStaking.d.ts",
+      "require": "./cjs/services/migration-service/scripts/DeleteChainStaking.js",
+      "default": "./services/migration-service/scripts/DeleteChainStaking.js"
+    },
     "./services/migration-service/scripts/DeleteEarningData": {
       "types": "./services/migration-service/scripts/DeleteEarningData.d.ts",
       "require": "./cjs/services/migration-service/scripts/DeleteEarningData.js",
@@ -1515,6 +1530,11 @@
       "require": "./cjs/types/campaigns/unlock-dot.js",
       "default": "./types/campaigns/unlock-dot.js"
     },
+    "./types/fee": {
+      "types": "./types/fee/index.d.ts",
+      "require": "./cjs/types/fee/index.js",
+      "default": "./types/fee/index.js"
+    },
     "./types/ordinal": {
       "types": "./types/ordinal.d.ts",
       "require": "./cjs/types/ordinal.js",
@@ -1710,6 +1730,11 @@
       "require": "./cjs/utils/registry.js",
       "default": "./utils/registry.js"
     },
+    "./utils/reportError": {
+      "types": "./utils/reportError.d.ts",
+      "require": "./cjs/utils/reportError.js",
+      "default": "./utils/reportError.js"
+    },
     "./utils/request": {
       "types": "./utils/request.d.ts",
       "require": "./cjs/utils/request.js",
@@ -1745,7 +1770,7 @@
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
     "@polkadot/api": "^10.11.2",
-    "@polkadot/api-base": "^10.9.1",
+    "@polkadot/api-base": "^10.11.2",
     "@polkadot/api-contract": "^10.11.2",
     "@polkadot/api-derive": "^10.11.2",
     "@polkadot/apps-config": "^0.133.1",
@@ -1761,11 +1786,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.42-beta.0",
-    "@subwallet/extension-base": "^1.1.40-0",
-    "@subwallet/extension-chains": "^1.1.40-0",
-    "@subwallet/extension-dapp": "^1.1.40-0",
-    "@subwallet/extension-inject": "^1.1.40-0",
+    "@subwallet/chain-list": "0.2.42",
+    "@subwallet/extension-base": "^1.1.41-0",
+    "@subwallet/extension-chains": "^1.1.41-0",
+    "@subwallet/extension-dapp": "^1.1.41-0",
+    "@subwallet/extension-inject": "^1.1.41-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

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

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -9,7 +9,7 @@ import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wa
 import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { subscribeERC20Interval } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/evm';
 import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
-import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetMultilocation, _isBridgedToken, _isChainEvmCompatible, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { subscribeEquilibriumTokenBalance } from "./equilibrium.js";
 export async function subscribeSubstrateBalance(addresses, chainInfo, chain, networkAPI, evmApiMap, callBack) {
@@ -20,6 +20,7 @@ export async function subscribeSubstrateBalance(addresses, chainInfo, chain, net
   let unsubLocalToken;
   let unsubEvmContractToken;
   let unsubWasmContractToken;
+  let unsubBridgedToken;
   try {
     if (_BALANCE_CHAIN_GROUP.bifrost.includes(chain)) {
       unsubLocalToken = await subscribeTokensAccountsPallet(addresses, chain, networkAPI.api, callBack);
@@ -32,6 +33,9 @@ export async function subscribeSubstrateBalance(addresses, chainInfo, chain, net
     } else if (_BALANCE_CHAIN_GROUP.centrifuge.includes(chain)) {
       unsubLocalToken = await subscribeOrmlTokensPallet(addresses, chain, networkAPI.api, callBack);
     }
+    if (_BALANCE_CHAIN_GROUP.supportBridged.includes(chain)) {
+      unsubBridgedToken = await subscribeBridgedBalance(addresses, chain, networkAPI.api, callBack);
+    }
     if (_isChainEvmCompatible(chainInfo)) {
       unsubEvmContractToken = subscribeERC20Interval(addresses, chain, evmApiMap, callBack);
     }
@@ -47,6 +51,7 @@ export async function subscribeSubstrateBalance(addresses, chainInfo, chain, net
     unsubLocalToken && unsubLocalToken();
     unsubEvmContractToken && unsubEvmContractToken();
     unsubWasmContractToken && unsubWasmContractToken();
+    unsubBridgedToken && unsubBridgedToken();
   };
 }
 
@@ -110,6 +115,59 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
     unsub();
   };
 }
+async function subscribeBridgedBalance(addresses, chain, api, callBack) {
+  const tokenMap = state.getAssetByChainAndAsset(chain, [_AssetType.LOCAL]);
+
+  // @ts-ignore
+  const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
+    try {
+      const isBridgedToken = _isBridgedToken(tokenInfo);
+      if (isBridgedToken) {
+        const multiLocation = _getXcmAssetMultilocation(tokenInfo);
+        return await api.query.foreignAssets.account.multi(addresses.map(address => [multiLocation, address]), balances => {
+          const items = balances.map((balance, index) => {
+            const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
+            let frozen = BN_ZERO;
+            let total = BN_ZERO;
+            if (bdata) {
+              // @ts-ignore
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
+              const addressBalance = new BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
+
+              // @ts-ignore
+              if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
+                frozen = addressBalance;
+              } else {
+                total = addressBalance;
+              }
+            }
+            const free = total.sub(frozen);
+            return {
+              address: addresses[index],
+              tokenSlug: tokenInfo.slug,
+              free: free.toString(),
+              locked: frozen.toString(),
+              state: APIItemState.READY,
+              substrateInfo: {
+                miscFrozen: frozen.toString(),
+                reserved: '0'
+              }
+            };
+          });
+          callBack(items);
+        });
+      }
+    } catch (err) {
+      console.warn(err);
+    }
+    return undefined;
+  }));
+  return () => {
+    unsubList.forEach(unsub => {
+      unsub && unsub();
+    });
+  };
+}
 function subscribePSP22Balance(addresses, chain, api, callBack) {
   let tokenList = {};
   const psp22ContractMap = {};

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

@@ -18,6 +18,7 @@ export declare const _BALANCE_CHAIN_GROUP: {
     statemine: string[];
     kusama: string[];
     centrifuge: string[];
+    supportBridged: string[];
 };
 export declare const _BALANCE_TOKEN_GROUP: {
     crab: string[];
@@ -63,6 +64,7 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     avail: string[];
     pendulum: string[];
     centrifuge: string[];
+    disable_transfer: string[];
 };
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];

package/services/chain-service/constants.js

@@ -28,11 +28,12 @@ export const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum', 'amplitude', 'continuum_network'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari', 'manta_network', 'rococo_assethub', 'liberlandTest', 'liberland'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
-  centrifuge: ['centrifuge']
+  centrifuge: ['centrifuge'],
+  supportBridged: ['rococo_assethub']
 };
 export const _BALANCE_TOKEN_GROUP = {
   crab: ['CKTON', 'PKTON'],
@@ -46,7 +47,7 @@ export const _NFT_CHAIN_GROUP = {
   statemine: ['statemine'],
   statemint: ['statemint'],
   unique_network: ['unique_network', 'quartz', 'opal'],
-  bitcountry: ['bitcountry', 'pioneer'],
+  bitcountry: ['bitcountry', 'pioneer', 'continuum_network'],
   vara: ['vara_network']
 };
 
@@ -71,6 +72,7 @@ export const _STAKING_ERA_LENGTH_MAP = {
   shibuya: 24,
   bifrost_testnet: 0.5,
   bifrost: 2,
+  bifrost_dot: 24,
   ternoa: 24,
   calamari: 6,
   calamari_test: 6,
@@ -201,12 +203,13 @@ export const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
-  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
+  statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
-  centrifuge: ['centrifuge']
+  centrifuge: ['centrifuge'],
+  disable_transfer: ['invarch', 'continuum_network']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']
@@ -233,7 +236,8 @@ export const _XCM_TYPE = {
 
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network'];
 export const EVM_PASS_CONNECT_STATUS = {
-  arbitrum_one: ['*']
+  arbitrum_one: ['*'],
+  okxTest: ['*']
 };
 export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']