@subwallet/extension-base 1.0.2-2 → 1.0.3-0

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

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PriceService = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _types = require("@subwallet/extension-base/services/base/types");
 var _coingecko = require("@subwallet/extension-base/services/price-service/coingecko");
+var _promise = require("@subwallet/extension-base/utils/promise");
 var _rxjs = require("rxjs");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -20,34 +22,14 @@ class PriceService {
   priceSubject = new _rxjs.BehaviorSubject(DEFAULT_PRICE_SUBJECT);
   priceIds = new Set();
   constructor(dbService, eventService, chainService) {
+    this.status = _types.ServiceStatus.NOT_INITIALIZED;
     this.dbService = dbService;
     this.eventService = eventService;
     this.chainService = chainService;
-
-    // Fetch data from storage
-    this.getPrice().catch(console.error);
-    const eventHandler = () => {
-      const newPriceIds = this.getPriceIds();
-
-      // Compare two set newPriceIds and this.priceIds
-      if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
-        this.priceIds = newPriceIds;
-        this.refreshPriceData(this.priceIds);
-      }
-    };
-    this.eventService.waitAssetReady.then(() => {
-      this.refreshPriceData();
-      this.eventService.on('asset.enable', eventHandler);
-      this.eventService.on('asset.update', eventHandler);
-    }).catch(console.error);
+    this.init().catch(console.error);
   }
   async getPrice() {
-    const isReady = this.priceSubject.value.ready;
-    if (!isReady) {
-      const data = await this.dbService.getPriceStore();
-      this.priceSubject.next(data || DEFAULT_PRICE_SUBJECT);
-    }
-    return this.priceSubject.value;
+    return Promise.resolve(this.priceSubject.value);
   }
   getPriceSubject() {
     return this.priceSubject;
@@ -68,9 +50,74 @@ class PriceService {
         ready: true
       });
       this.dbService.updatePriceStore(rs).catch(console.error);
-      console.log('Get Token Price From CoinGecko');
     }).catch(console.error);
     this.refreshTimeout = setTimeout(this.refreshPriceData.bind(this), _constants.CRON_REFRESH_PRICE_INTERVAL);
   }
+  async init() {
+    this.status = _types.ServiceStatus.INITIALIZING;
+    // Fetch data from storage
+    await this.loadData();
+    const eventHandler = () => {
+      const newPriceIds = this.getPriceIds();
+
+      // Compare two set newPriceIds and this.priceIds
+      if (newPriceIds.size !== this.priceIds.size || !Array.from(newPriceIds).every(v => this.priceIds.has(v))) {
+        this.priceIds = newPriceIds;
+        this.refreshPriceData(this.priceIds);
+      }
+    };
+    await this.eventService.waitAssetReady;
+    this.status = _types.ServiceStatus.INITIALIZED;
+    this.eventService.on('asset.updateState', eventHandler);
+    this.eventService.on('asset.updateState', eventHandler);
+  }
+  async loadData() {
+    const data = await this.dbService.getPriceStore();
+    this.priceSubject.next(data || DEFAULT_PRICE_SUBJECT);
+  }
+  async persistData() {
+    await this.dbService.updatePriceStore(this.priceSubject.value).catch(console.error);
+  }
+  startPromiseHandler = (0, _promise.createPromiseHandler)();
+  async start() {
+    console.debug('Start price service');
+    try {
+      this.startPromiseHandler = (0, _promise.createPromiseHandler)();
+      this.status = _types.ServiceStatus.STARTING;
+      await this.startCron();
+      this.status = _types.ServiceStatus.STARTED;
+      this.startPromiseHandler.resolve();
+    } catch (e) {
+      this.startPromiseHandler.reject(e);
+    }
+  }
+  async startCron() {
+    this.refreshPriceData();
+    return Promise.resolve();
+  }
+  stopPromiseHandler = (0, _promise.createPromiseHandler)();
+  async stop() {
+    console.debug('Stop price service');
+    try {
+      this.status = _types.ServiceStatus.STOPPING;
+      this.stopPromiseHandler = (0, _promise.createPromiseHandler)();
+      await this.stopCron();
+      await this.persistData();
+      this.status = _types.ServiceStatus.STOPPED;
+      this.stopPromiseHandler.resolve();
+    } catch (e) {
+      this.stopPromiseHandler.reject(e);
+    }
+  }
+  stopCron() {
+    clearTimeout(this.refreshTimeout);
+    return Promise.resolve(undefined);
+  }
+  waitForStarted() {
+    return this.startPromiseHandler.promise;
+  }
+  waitForStopped() {
+    return this.stopPromiseHandler.promise;
+  }
 }
 exports.PriceService = PriceService;

package/cjs/services/request-service/handler/AuthRequestHandler.js

@@ -10,7 +10,6 @@ var _constants = require("@subwallet/extension-base/services/request-service/con
 var _Authorize = _interopRequireDefault(require("@subwallet/extension-base/stores/Authorize"));
 var _utils2 = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -27,7 +26,8 @@ class AuthRequestHandler {
   authorizeUrlSubject = new _rxjs.Subject();
   evmChainSubject = new _rxjs.Subject();
   authSubjectV2 = new _rxjs.BehaviorSubject([]);
-  constructor(requestService, chainService) {
+  constructor(requestService, chainService, keyringService) {
+    this.keyringService = keyringService;
     this.#requestService = requestService;
     this.#chainService = chainService;
   }
@@ -38,7 +38,7 @@ class AuthRequestHandler {
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(_accounts.accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -95,11 +95,11 @@ class AuthRequestHandler {
     const chainInfoMaps = this.#chainService.getChainInfoMap();
     const chainStateMap = this.#chainService.getChainStateMap();
     let defaultChain = options.defaultChain;
-    const needEnableChains = [];
+    let needEnableChains = [];
     if (options.url) {
       const domain = (0, _utils2.getDomainFromUrl)(options.url);
       const predefinedSupportChains = _constants.PREDEFINED_CHAIN_DAPP_CHAIN_MAP[domain];
-      if (predefinedSupportChains) {
+      if (!defaultChain && predefinedSupportChains) {
         defaultChain = predefinedSupportChains[0];
         options.autoActive && needEnableChains.push(...predefinedSupportChains);
       }
@@ -112,11 +112,17 @@ class AuthRequestHandler {
         return (_chainStateMap$chain$ = chainStateMap[chain.slug]) === null || _chainStateMap$chain$ === void 0 ? void 0 : _chainStateMap$chain$.active;
       })) || evmChains[0];
       if (options.autoActive) {
-        if (!needEnableChains.includes(chainInfo.slug)) {
-          needEnableChains.push(chainInfo.slug);
+        var _chainInfo;
+        if (!needEnableChains.includes((_chainInfo = chainInfo) === null || _chainInfo === void 0 ? void 0 : _chainInfo.slug)) {
+          var _chainInfo2;
+          needEnableChains.push((_chainInfo2 = chainInfo) === null || _chainInfo2 === void 0 ? void 0 : _chainInfo2.slug);
         }
       }
     }
+    needEnableChains = needEnableChains.filter(slug => {
+      var _chainStateMap$slug;
+      return !((_chainStateMap$slug = chainStateMap[slug]) !== null && _chainStateMap$slug !== void 0 && _chainStateMap$slug.active);
+    });
     needEnableChains.length > 0 && this.#chainService.enableChains(needEnableChains);
     return chainInfo;
   }

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -76,16 +76,7 @@ class EvmRequestHandler {
     });
     this.confirmationsQueueSubject.next(confirmations);
     if (!isInternal) {
-      // Not open new popup and use existed
-      const popupList = this.#requestService.popup;
-      if (this.#requestService.popup.length > 0) {
-        // eslint-disable-next-line no-void
-        void chrome.windows.update(popupList[0], {
-          focused: true
-        });
-      } else {
-        this.#requestService.popupOpen();
-      }
+      this.#requestService.popupOpen();
     }
     this.#requestService.updateIconV2();
     return promise;
@@ -136,7 +127,8 @@ class EvmRequestHandler {
       data: (0, _ethereumjsUtil.toBuffer)(config.data)
     };
     const common = _common.default.custom({
-      chainId: config.chainId
+      chainId: config.chainId,
+      defaultHardfork: 'petersburg'
     });
 
     // @ts-ignore
@@ -149,11 +141,15 @@ class EvmRequestHandler {
     const {
       estimateGas,
       from,
-      gasPrice
+      gas,
+      gasPrice,
+      value
     } = transaction;
     const pair = _uiKeyring.default.getPair(from);
     const params = {
       ...transaction,
+      gas: (0, _eth.anyNumberToBN)(gas).toNumber(),
+      value: (0, _eth.anyNumberToBN)(value).toNumber(),
       gasPrice: (0, _eth.anyNumberToBN)(gasPrice).toNumber(),
       gasLimit: (0, _eth.anyNumberToBN)(estimateGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service

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

@@ -10,7 +10,6 @@ var _EvmRequestHandler = _interopRequireDefault(require("@subwallet/extension-ba
 var _MetadataRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler"));
 var _PopupHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/PopupHandler"));
 var _SubstrateRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler"));
-var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -24,12 +23,13 @@ class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService, settingService) {
+  constructor(chainService, settingService, keyringService) {
+    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
     this.#popupHandler = new _PopupHandler.default(this);
     this.#metadataRequestHandler = new _MetadataRequestHandler.default(this);
-    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService);
+    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new _SubstrateRequestHandler.default(this);
     this.#evmRequestHandler = new _EvmRequestHandler.default(this);
 
@@ -44,7 +44,7 @@ class RequestService {
   }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    const addressList = Object.keys(_accounts.accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -59,7 +59,16 @@ class RequestService {
     this.#popupHandler.popupClose();
   }
   popupOpen() {
-    this.#popupHandler.popupOpen();
+    // Not open new popup and use existed
+    const popupList = this.#popupHandler.popup;
+    if (popupList && popupList.length > 0) {
+      var _chrome$windows$updat;
+      (_chrome$windows$updat = chrome.windows.update(popupList[0], {
+        focused: true
+      })) === null || _chrome$windows$updat === void 0 ? void 0 : _chrome$windows$updat.catch(console.error);
+    } else {
+      this.#popupHandler.popupOpen();
+    }
   }
 
   // Metadata

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

@@ -10,6 +10,7 @@ var _databases = _interopRequireDefault(require("@subwallet/extension-base/servi
 var _dbStores = require("@subwallet/extension-base/services/storage-service/db-stores");
 var _ChainStakingMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata"));
 var _NominatorMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata"));
+var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -54,7 +55,8 @@ class DatabaseService {
   }
   async updateBalanceStore(address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      this.logger.log(`Updating balance for [${item.tokenSlug}]`);
+      // this.logger.log(`Updating balance for [${item.tokenSlug}]`);
+
       return this.stores.balance.upsert({
         address,
         ...item
@@ -69,14 +71,16 @@ class DatabaseService {
   // Crowdloan
   async updateCrowdloanStore(chain, address, item) {
     if (item.state === _KoniTypes.APIItemState.READY && item.contribute !== '0') {
-      this.logger.log(`Updating crowdloan for [${chain}]`);
+      // this.logger.log(`Updating crowdloan for [${chain}]`);
+
       return this.stores.crowdloan.upsert({
         chain,
         address,
         ...item
       });
     } else {
-      this.logger.debug(`Removing crowdloan for [${chain}]`);
+      // this.logger.debug(`Removing crowdloan for [${chain}]`);
+
       return this.stores.crowdloan.deleteByChainAndAddress(chain, address);
     }
   }
@@ -84,22 +88,23 @@ class DatabaseService {
   // Staking
   async updateStaking(chain, address, item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
-      this.logger.log(`Updating staking for [${chain}]`);
+      // this.logger.log(`Updating staking for [${chain}]`);
+
       return this.stores.staking.upsert(item);
     }
   }
   async getStakings(addresses, chains) {
-    const stakings = await this.stores.staking.getStakings(addresses, chains);
-    this.logger.log('Get Stakings: ', stakings);
-    return stakings;
+    // this.logger.log('Get Stakings: ', stakings);
+
+    return this.stores.staking.getStakings(addresses, chains);
   }
   async getStakingsByChains(chains) {
     return this.stores.staking.getStakingsByChains(chains);
   }
   async getPooledStakings(addresses, chainHashes) {
-    const stakings = await this.stores.staking.getPooledStakings(addresses, chainHashes);
-    this.logger.log('Get Pooled Stakings: ', stakings);
-    return stakings;
+    // this.logger.log('Get Pooled Stakings: ', stakings);
+
+    return this.stores.staking.getPooledStakings(addresses, chainHashes);
   }
   subscribeStaking(addresses, chainList, callback) {
     this.stakingSubscription && this.stakingSubscription.unsubscribe();
@@ -121,18 +126,28 @@ class DatabaseService {
 
   // Transaction histories
   async getHistories(query) {
-    const histories = await this.stores.transaction.queryHistory(query);
-    this.logger.log('Get histories: ', histories);
-    return histories;
+    return this.stores.transaction.queryHistory(query);
   }
   async upsertHistory(histories) {
-    this.logger.log('Updating transaction histories');
-    return this.stores.transaction.bulkUpsert(histories);
+    // this.logger.log('Updating transaction histories');
+    const cleanedHistory = histories.filter(x => x && x.address && x.chain && x.extrinsicHash);
+    return this.stores.transaction.bulkUpsert(cleanedHistory);
+  }
+  async updateHistoryByNewExtrinsicHash(extrinsicHash, updateData) {
+    // this.logger.log('Updating transaction histories');
+    const canUpdate = updateData && extrinsicHash;
+    if (!canUpdate) {
+      return;
+    }
+    return this.stores.transaction.updateWithQuery({
+      extrinsicHash
+    }, updateData);
   }
 
   // NFT Collection
   async addNftCollection(collection) {
-    this.logger.log(`Updating NFT collection for [${collection.chain}]`);
+    // this.logger.log(`Updating NFT collection for [${collection.chain}]`);
+
     return this.stores.nftCollection.upsert(collection);
   }
   async deleteNftCollection(chain, collectionId) {
@@ -151,13 +166,22 @@ class DatabaseService {
     });
     return this.nftSubscription;
   }
+  async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
+    if (ownNothing) {
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, (0, _utils.reformatAddress)(owner, 42));
+    }
+    const result = await this.stores.nft.cleanUpNfts(chain, (0, _utils.reformatAddress)(owner, 42), collectionIds, nftIds);
+    result > 0 && console.debug(`Cleaned up ${result} NFTs on chain ${chain} for owner ${(0, _utils.reformatAddress)(owner, 42)}`, collectionIds, nftIds);
+    return result;
+  }
   async getNft(addresses, chainHashes) {
-    const nfts = await this.stores.nft.getNft(addresses, chainHashes);
-    this.logger.log('Get NFTs: ', nfts);
-    return nfts;
+    // this.logger.log('Get NFTs: ', nfts);
+
+    return this.stores.nft.getNft(addresses, chainHashes);
   }
   async addNft(address, nft) {
-    this.logger.log(`Updating NFT for [${nft.chain}]`);
+    // this.logger.log(`Updating NFT for [${nft.chain}]`);
+
     return this.stores.nft.upsert({
       ...nft,
       address
@@ -167,47 +191,54 @@ class DatabaseService {
     return this.stores.nft.deleteNftItem(chain, addresses, nftItem);
   }
   removeNfts(chain, address, collectionId, nftIds) {
-    this.logger.log(`Remove NFTs [${nftIds.join(', ')}]`);
+    // this.logger.log(`Remove NFTs [${nftIds.join(', ')}]`);
+
     return this.stores.nft.removeNfts(chain, address, collectionId, nftIds);
   }
 
   // Chain
   async updateChainStore(item) {
-    this.logger.log(`Updating storageInfo for chain [${item.slug}]`);
+    // this.logger.log(`Updating storageInfo for chain [${item.slug}]`);
+
     return this.stores.chain.upsert(item);
   }
   async bulkUpdateChainStore(data) {
-    this.logger.log('Bulk updating ChainStore');
+    // this.logger.log('Bulk updating ChainStore');
+
     return this.stores.chain.bulkUpsert(data);
   }
   async removeFromChainStore(chains) {
-    this.logger.log('Bulk removing ChainStore');
+    // this.logger.log('Bulk removing ChainStore');
+
     return this.stores.chain.removeChains(chains);
   }
   async getAllChainStore() {
-    const allChains = await this.stores.chain.getAll();
-    this.logger.log('Get all chains: ', allChains);
-    return allChains;
+    // this.logger.log('Get all chains: ', allChains);
+
+    return this.stores.chain.getAll();
   }
 
   // Asset
   async updateAssetStore(item) {
-    this.logger.log(`Updating storageInfo for chainAsset [${item.originChain}]`);
+    // this.logger.log(`Updating storageInfo for chainAsset [${item.originChain}]`);
+
     return this.stores.asset.upsert(item);
   }
   async getAllAssetStore() {
-    const allAssets = await this.stores.asset.getAll();
-    this.logger.log('Get all stored assets: ', allAssets);
-    return allAssets;
+    // this.logger.log('Get all stored assets: ', allAssets);
+
+    return this.stores.asset.getAll();
   }
   async removeFromAssetStore(items) {
-    this.logger.log('Bulk removing AssetStore');
+    // this.logger.log('Bulk removing AssetStore');
+
     return this.stores.asset.removeAssets(items);
   }
 
   // Staking
   async updateChainStakingMetadata(item) {
-    this.logger.log('Update ChainStakingMetadata: ', item.chain);
+    // this.logger.log('Update ChainStakingMetadata: ', item.chain);
+
     return this.stores.chainStakingMetadata.upsert(item);
   }
   async getChainStakingMetadata() {
@@ -218,7 +249,8 @@ class DatabaseService {
     return this.stores.chainStakingMetadata.getByChainAndType(chain, type);
   }
   async updateNominatorMetadata(item) {
-    this.logger.log('Update NominatorMetadata: ', item.address, item.chain);
+    // this.logger.log('Update NominatorMetadata: ', item.address, item.chain);
+
     return this.stores.nominatorMetadata.upsert(item);
   }
   async getNominatorMetadata() {

package/cjs/services/storage-service/db-stores/Nft.js

@@ -24,25 +24,17 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     return (0, _dexie.liveQuery)(() => this.getNft(addresses, chainList));
   }
-  deleteRemovedNftsFromCollection(chainHash, address, collection) {
-    let nftIds = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    const conditions = {
-      chainHash,
-      address
-    };
-    if (!collection && nftIds && nftIds.length) {
-      return this.logger.warn('Missing collection id');
-    }
-    if (collection) {
-      conditions.collectionId = collection;
-    }
-    return this.table.where(conditions).and(item => !nftIds.some(nft => nft === item.id)).delete();
+  cleanUpNfts(chain, address, collectionIds, nftIds) {
+    return this.table.where({
+      address,
+      chain
+    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
   }
-  deleteNftsFromRemovedCollection(chain, address, collectionIds) {
+  deleteNftsByChainAndOwner(chain, address) {
     return this.table.where({
       address,
       chain
-    }).and(nft => !collectionIds.some(item => item === nft.collectionId));
+    }).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

package/cjs/services/storage-service/db-stores/Transaction.js

@@ -36,16 +36,12 @@ class TransactionStore extends _BaseStoreWithAddressAndChain.default {
   }
   async bulkUpsert(records) {
     await this.table.bulkPut(records);
-
-    // await Promise.all(records.map((record) => {
-    //   return this.table.where({
-    //     chain: record.chain,
-    //     address: record.address,
-    //     extrinsicHash: record.extrinsicHash
-    //   }).filter((item) => (item.origin === 'app' && record.origin !== 'app'))
-    //     .delete();
-    // }));
-
+    return true;
+  }
+  async updateWithQuery(query, update) {
+    await this.table.where(query).modify(record => {
+      return Object.assign(record, update);
+    });
     return true;
   }
 }

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

@@ -10,43 +10,28 @@ var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 // SPDX-License-Identifier: Apache-2.0
 
 function parseXcmEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chainInfo) {
-  let isFeeUseMainTokenSymbol = true;
   for (let index = 0; index < eventLogs.length; index++) {
     const record = eventLogs[index];
-    if (['karura', 'acala', 'acala_testnet'].includes(chain) && sendingTokenInfo && !(0, _utils._isNativeToken)(sendingTokenInfo)) {
-      if (record.event.section === 'currencies' && record.event.method.toLowerCase() === 'transferred') {
-        if (index === 0) {
-          var _record$event$data$;
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          historyItem.fee = {
-            value: ((_record$event$data$ = record.event.data[3]) === null || _record$event$data$ === void 0 ? void 0 : _record$event$data$.toString()) || '0',
-            symbol: sendingTokenInfo.symbol,
-            decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
-          };
-          isFeeUseMainTokenSymbol = false;
-        }
-      }
-    }
     const {
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-    if (isFeeUseMainTokenSymbol && record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
-      var _record$event$data$2;
-      if ((_record$event$data$2 = record.event.data[1]) !== null && _record$event$data$2 !== void 0 && _record$event$data$2.toString()) {
-        var _record$event$data$3;
+    if (record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
+      var _record$event$data$;
+      if ((_record$event$data$ = record.event.data[1]) !== null && _record$event$data$ !== void 0 && _record$event$data$.toString()) {
+        var _record$event$data$2;
         historyItem.fee = {
-          value: (_record$event$data$3 = record.event.data[1]) === null || _record$event$data$3 === void 0 ? void 0 : _record$event$data$3.toString(),
+          value: (_record$event$data$2 = record.event.data[1]) === null || _record$event$data$2 === void 0 ? void 0 : _record$event$data$2.toString(),
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };
       }
-    } else if (isFeeUseMainTokenSymbol && record.event.section === 'tokens' && record.event.method.toLowerCase() === 'withdrawn') {
-      var _record$event$data$4;
-      if ((_record$event$data$4 = record.event.data[2]) !== null && _record$event$data$4 !== void 0 && _record$event$data$4.toString()) {
-        var _record$event$data$5;
+    } else if (record.event.section === 'tokens' && record.event.method.toLowerCase() === 'withdrawn') {
+      var _record$event$data$3;
+      if (!historyItem.fee && (_record$event$data$3 = record.event.data[2]) !== null && _record$event$data$3 !== void 0 && _record$event$data$3.toString()) {
+        var _record$event$data$4;
         historyItem.fee = {
-          value: (_record$event$data$5 = record.event.data[2]) === null || _record$event$data$5 === void 0 ? void 0 : _record$event$data$5.toString(),
+          value: (_record$event$data$4 = record.event.data[2]) === null || _record$event$data$4 === void 0 ? void 0 : _record$event$data$4.toString(),
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };
@@ -55,28 +40,15 @@ function parseXcmEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chai
   }
 }
 function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTokenInfo, chainInfo) {
-  let isFeeUseMainTokenSymbol = true;
   for (let index = 0; index < eventLogs.length; index++) {
     const record = eventLogs[index];
-    if (['karura', 'acala', 'acala_testnet'].includes(chain) && !(0, _utils._isNativeToken)(sendingTokenInfo)) {
-      if (record.event.section === 'currencies' && record.event.method.toLowerCase() === 'transferred') {
-        if (index === 0) {
-          var _record$event$data$6;
-          historyItem.fee = {
-            value: ((_record$event$data$6 = record.event.data[3]) === null || _record$event$data$6 === void 0 ? void 0 : _record$event$data$6.toString()) || '0',
-            symbol: sendingTokenInfo.symbol,
-            decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
-          };
-          isFeeUseMainTokenSymbol = false;
-        }
-      }
-    } else if (['genshiro_testnet', 'genshiro', 'equilibrium_parachain'].includes(chain) && sendingTokenInfo) {
+    if (['genshiro_testnet', 'genshiro', 'equilibrium_parachain'].includes(chain) && sendingTokenInfo) {
       if (record.event.section === 'transactionPayment' && record.event.method.toLowerCase() === 'transactionfeepaid') {
-        var _record$event$data$7;
-        if ((_record$event$data$7 = record.event.data[1]) !== null && _record$event$data$7 !== void 0 && _record$event$data$7.toString()) {
-          var _record$event$data$8;
+        var _record$event$data$5;
+        if ((_record$event$data$5 = record.event.data[1]) !== null && _record$event$data$5 !== void 0 && _record$event$data$5.toString()) {
+          var _record$event$data$6;
           historyItem.fee = {
-            value: ((_record$event$data$8 = record.event.data[1]) === null || _record$event$data$8 === void 0 ? void 0 : _record$event$data$8.toString()) || '0',
+            value: ((_record$event$data$6 = record.event.data[1]) === null || _record$event$data$6 === void 0 ? void 0 : _record$event$data$6.toString()) || '0',
             symbol: sendingTokenInfo.symbol,
             decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
           };
@@ -87,13 +59,13 @@ function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTokenInfo,
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-    if (isFeeUseMainTokenSymbol && record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
-      var _record$event$data$9;
-      if ((_record$event$data$9 = record.event.data[1]) !== null && _record$event$data$9 !== void 0 && _record$event$data$9.toString()) {
-        var _record$event$data$10;
+    if (record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
+      var _record$event$data$7;
+      if ((_record$event$data$7 = record.event.data[1]) !== null && _record$event$data$7 !== void 0 && _record$event$data$7.toString()) {
+        var _record$event$data$8;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         historyItem.fee = {
-          value: ((_record$event$data$10 = record.event.data[1]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
+          value: ((_record$event$data$8 = record.event.data[1]) === null || _record$event$data$8 === void 0 ? void 0 : _record$event$data$8.toString()) || '0',
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };