@subwallet/extension-base 1.0.2-1 → 1.0.2-1b

package/services/chain-service/index.js

@@ -277,7 +277,7 @@ export class ChainService {
     this.dbService.removeFromChainStore([slug]).catch(console.error);
     this.updateChainSubscription();
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.remove', slug);
+    this.eventService.emit('chain.updateState', slug);
     return true;
   }
   resetChainInfoMap(excludedChains) {
@@ -343,7 +343,7 @@ export class ChainService {
     this.dbService.removeFromAssetStore(targetAssets).catch(e => this.logger.error(e));
     this.assetRegistrySubject.next(assetRegistry);
     targetAssets.forEach(assetSlug => {
-      this.eventService.emit('asset.remove', assetSlug);
+      this.eventService.emit('asset.updateState', assetSlug);
     });
   }
 
@@ -414,7 +414,7 @@ export class ChainService {
       currentProvider: chainStateMap[chainSlug].currentProvider
     }).catch(console.error);
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.enable', chainSlug);
+    this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
   enableChain(chainSlug) {
@@ -449,7 +449,7 @@ export class ChainService {
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.disable', chainSlug);
+    this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
   checkExistedPredefinedChain(genesisHash, evmChainId) {
@@ -672,7 +672,7 @@ export class ChainService {
       active: targetChainState.active,
       currentProvider: targetChainState.currentProvider
     }).then(() => {
-      this.eventService.emit('chain.update', chainSlug);
+      this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
   }
   insertChain(params) {
@@ -1105,7 +1105,6 @@ export class ChainService {
       this.setAssetSettings(assetSettings, false);
     }
     this.eventService.emit('asset.ready', true);
-    console.log('Done init asset settings');
   }
   setAssetSettings(assetSettings, emitEvent = true) {
     const updateAssets = [];
@@ -1119,7 +1118,7 @@ export class ChainService {
     }
     this.assetSettingSubject.next(assetSettings);
     updateAssets.forEach(slug => {
-      this.eventService.emit(assetSettings[slug].visible ? 'asset.enable' : 'asset.disable', slug);
+      this.eventService.emit('asset.updateState', slug);
     });
     this.store.set('AssetSetting', assetSettings);
   }

package/services/event-service/index.js

@@ -34,7 +34,11 @@ export class EventService extends EventEmitter {
     }, this.lazyTime);
   }
   emitLazy() {
-    this.lazyEmitter.emit('lazy', this.pendingEvents, this.pendingEvents.map(e => e.type));
+    try {
+      this.lazyEmitter.emit('lazy', this.pendingEvents, this.pendingEvents.map(e => e.type));
+    } catch (e) {
+      console.error('Get error in some listener of lazy event', e);
+    }
     this.pendingEvents = [];
     this.timeoutId = null;
   }

package/services/event-service/types.d.ts

@@ -9,20 +9,16 @@ export interface EventRegistry {
     'account.remove': [string];
     'chain.ready': [boolean];
     'chain.add': [string];
-    'chain.update': [string];
-    'chain.disable': [string];
-    'chain.enable': [string];
-    'chain.remove': [string];
+    'chain.updateState': [string];
     'asset.ready': [boolean];
-    'asset.add': [string];
-    'asset.update': [string];
-    'asset.enable': [string];
-    'asset.disable': [string];
-    'asset.remove': [string];
+    'asset.updateState': [string];
     'transaction.done': [SWTransaction];
     'transaction.failed': [SWTransaction | undefined];
+    'transaction.submitStaking': [string];
+    'transaction.transferNft': [SWTransaction | undefined];
 }
 export declare type EventType = keyof EventRegistry;
+export declare const COMMON_RELOAD_EVENTS: EventType[];
 export interface EventItem<T extends EventType> {
     type: T;
     data: EventRegistry[T];

package/services/event-service/types.js

@@ -1 +1,4 @@
-export {};
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'asset.updateState', 'account.add', 'chain.updateState', 'account.remove', 'chain.add'];

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

@@ -17,8 +17,8 @@ export declare class HistoryService {
     refreshHistoryInterval(): void;
     getHistories(): Promise<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>;
     getHistorySubject(): Promise<BehaviorSubject<TransactionHistoryItem<import("@subwallet/extension-base/background/KoniTypes").ExtrinsicType.TRANSFER_BALANCE>[]>>;
-    insertHistories(historyItems: TransactionHistoryItem[]): Promise<void>;
     updateHistories(chain: string, extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<void>;
+    insertHistories(historyItems: TransactionHistoryItem[]): Promise<void>;
     addHistoryItems(historyItems: TransactionHistoryItem[]): Promise<void>;
     removeHistoryByAddress(address: string): Promise<void>;
 }

package/services/history-service/index.js

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CRON_REFRESH_HISTORY_INTERVAL } from '@subwallet/extension-base/constants';
-import { quickFormatAddressToCompare } from '@subwallet/extension-base/utils/address';
 import { keyring } from '@subwallet/ui-keyring';
 import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 import { BehaviorSubject } from 'rxjs';
@@ -50,7 +49,7 @@ export class HistoryService {
       record.fromName = accountMap[(_record$from = record.from) === null || _record$from === void 0 ? void 0 : _record$from.toLowerCase()];
       record.toName = accountMap[(_record$to = record.to) === null || _record$to === void 0 ? void 0 : _record$to.toLowerCase()];
     });
-    this.dbService.upsertHistory(historyRecords).catch(console.error);
+    await this.addHistoryItems(historyRecords);
     return historyRecords;
   }
   async fetchHistories(addresses) {
@@ -75,8 +74,8 @@ export class HistoryService {
     const addressList = keyring.getAccounts().map(a => a.address);
     const currentHistories = this.historySubject.value;
     if (!this.fetchPromise || currentHistories.length === 0) {
-      const historyRecords = await this.fetchHistories(addressList);
-      this.historySubject.next(historyRecords);
+      await this.fetchHistories(addressList);
+      this.historySubject.next(await this.dbService.getHistories());
     }
     return this.historySubject.getValue();
   }
@@ -84,10 +83,6 @@ export class HistoryService {
     await this.getHistories();
     return this.historySubject;
   }
-  async insertHistories(historyItems) {
-    await this.dbService.upsertHistory(historyItems);
-    this.historySubject.next(await this.dbService.getHistories());
-  }
   async updateHistories(chain, extrinsicHash, updateData) {
     const existedRecords = await this.dbService.getHistories({
       chain,
@@ -101,14 +96,25 @@ export class HistoryService {
     });
     await this.addHistoryItems(updatedRecords);
   }
+
+  // Insert history without check override origin 'app'
+  async insertHistories(historyItems) {
+    await this.dbService.upsertHistory(historyItems);
+    this.historySubject.next(await this.dbService.getHistories());
+  }
+
+  // Insert history with check override origin 'app'
   async addHistoryItems(historyItems) {
     // Prevent override record with original is 'app'
     const appRecords = this.historySubject.value.filter(item => item.origin === 'app');
     const excludeKeys = appRecords.map(item => {
-      return `${item.chain}-${quickFormatAddressToCompare(item.address) || ''}-${item.extrinsicHash}`;
+      return `${item.chain}-${item.extrinsicHash}`;
     });
     const updateRecords = historyItems.filter(item => {
-      const key = `${item.chain}-${quickFormatAddressToCompare(item.address) || ''}-${item.extrinsicHash}`;
+      const key = `${item.chain}-${item.extrinsicHash}`;
+
+      // !excludeKeys.includes(key) && console.log('Cancel update', key);
+
       return item.origin === 'app' || !excludeKeys.includes(key);
     });
     await this.dbService.upsertHistory(updateRecords);

package/services/history-service/subsquid-multi-chain-history.js

@@ -57,11 +57,15 @@ function autoFormatAddress(address) {
     return '';
   }
 }
-function generateSignature({
-  r,
-  s,
-  v
-}) {
+function generateSignature(input) {
+  if (!input) {
+    return '';
+  }
+  const {
+    r,
+    s,
+    v
+  } = input;
   const rHex = r.startsWith('0x') ? r.slice(2) : r;
   const sHex = s.startsWith('0x') ? s.slice(2) : s;
   const vHex = parseInt(v).toString(16);
@@ -243,14 +247,14 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
       console.warn(`Not found chain info for chain id: ${chainId}`);
       return;
     }
-    try {
-      usedAddresses.forEach(address => {
+    usedAddresses.forEach(address => {
+      try {
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
         histories.push(transactionData);
-      });
-    } catch (e) {
-      console.warn('Parse transaction data failed', e);
-    }
+      } catch (e) {
+        console.warn('Parse transaction data failed', address, e);
+      }
+    });
   });
   return histories;
 }

package/services/price-service/coingecko.js

@@ -16,7 +16,6 @@ export const getTokenPrice = async (priceIds, currency = 'usd') => {
       }
     }
     if (useBackupApi || ((_res = res) === null || _res === void 0 ? void 0 : _res.status) !== 200) {
-      console.log('Use backup api for price');
       useBackupApi = true;
       res = await axios.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
     }

package/services/price-service/index.js

@@ -31,8 +31,8 @@ export class PriceService {
     };
     this.eventService.waitAssetReady.then(() => {
       this.refreshPriceData();
-      this.eventService.on('asset.enable', eventHandler);
-      this.eventService.on('asset.update', eventHandler);
+      this.eventService.on('asset.updateState', eventHandler);
+      this.eventService.on('asset.updateState', eventHandler);
     }).catch(console.error);
   }
   async getPrice() {
@@ -62,7 +62,6 @@ export 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), CRON_REFRESH_PRICE_INTERVAL);
   }

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

@@ -84,11 +84,11 @@ export default 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 = getDomainFromUrl(options.url);
       const predefinedSupportChains = PREDEFINED_CHAIN_DAPP_CHAIN_MAP[domain];
-      if (predefinedSupportChains) {
+      if (!defaultChain && predefinedSupportChains) {
         defaultChain = predefinedSupportChains[0];
         options.autoActive && needEnableChains.push(...predefinedSupportChains);
       }
@@ -106,6 +106,10 @@ export default class AuthRequestHandler {
         }
       }
     }
+    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/services/storage-service/DatabaseService.d.ts

@@ -45,6 +45,7 @@ export default class DatabaseService {
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
     getAllNftCollection(chainHashes?: string[]): import("dexie").PromiseExtended<NftCollection[]>;
     subscribeNft(addresses: string[], chainHashes?: string[], callback?: (nfts: INft[]) => void): Subscription;
+    cleanUpNft(chain: string, owner: string, collectionId: string, nftIds: string[]): Promise<number>;
     getNft(addresses: string[], chainHashes?: string[]): Promise<INft[]>;
     addNft(address: string, nft: NftItem): Promise<unknown>;
     handleNftTransfer(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;

package/services/storage-service/DatabaseService.js

@@ -6,6 +6,7 @@ import KoniDatabase from '@subwallet/extension-base/services/storage-service/dat
 import { AssetStore, BalanceStore, ChainStore, CrowdloanStore, MigrationStore, NftCollectionStore, NftStore, PriceStore, StakingStore, TransactionStore } from '@subwallet/extension-base/services/storage-service/db-stores';
 import ChainStakingMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/ChainStakingMetadata';
 import NominatorMetadataStore from '@subwallet/extension-base/services/storage-service/db-stores/NominatorMetadata';
+import { reformatAddress } from '@subwallet/extension-base/utils';
 import { logger as createLogger } from '@polkadot/util';
 export default class DatabaseService {
   // TODO: might remove this
@@ -47,7 +48,8 @@ export default class DatabaseService {
   }
   async updateBalanceStore(address, item) {
     if (item.state === 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
@@ -62,14 +64,16 @@ export default class DatabaseService {
   // Crowdloan
   async updateCrowdloanStore(chain, address, item) {
     if (item.state === 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);
     }
   }
@@ -77,22 +81,23 @@ export default class DatabaseService {
   // Staking
   async updateStaking(chain, address, item) {
     if (item.state === 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();
@@ -114,18 +119,18 @@ export default 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');
+    // this.logger.log('Updating transaction histories');
+
     return this.stores.transaction.bulkUpsert(histories);
   }
 
   // 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) {
@@ -144,13 +149,19 @@ export default class DatabaseService {
     });
     return this.nftSubscription;
   }
+  async cleanUpNft(chain, owner, collectionId, nftIds) {
+    const result = await this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionId, nftIds);
+    result > 0 && console.debug(`Clean up ${result} NFTs from collection ${collectionId} on chain ${chain} for owner ${owner}`);
+    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
@@ -160,47 +171,54 @@ export default 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() {
@@ -210,7 +228,8 @@ export default 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/services/storage-service/db-stores/Nft.d.ts

@@ -4,8 +4,7 @@ import { INft } from '../databases';
 export default class NftStore extends BaseStoreWithAddressAndChain<INft> {
     getNft(addresses: string[], chainList?: string[]): import("dexie").PromiseExtended<INft[]>;
     subscribeNft(addresses: string[], chainList?: string[]): import("dexie").Observable<INft[]>;
-    deleteRemovedNftsFromCollection(chainHash: string, address: string, collection?: string, nftIds?: string[]): void | import("dexie").PromiseExtended<number>;
-    deleteNftsFromRemovedCollection(chain: string, address: string, collectionIds: string[]): import("dexie").Collection<INft, unknown>;
+    cleanUpNfts(chain: string, address: string, collectionId: string, nftIds: string[]): import("dexie").PromiseExtended<number>;
     deleteNftByAddress(addresses: string[]): import("dexie").PromiseExtended<number>;
     deleteNftItem(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;
     deleteNftsByCollection(chain: string, collectionId: string): import("dexie").PromiseExtended<number>;

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

@@ -15,24 +15,12 @@ export default class NftStore extends BaseStoreWithAddressAndChain {
   subscribeNft(addresses, chainList = []) {
     return liveQuery(() => this.getNft(addresses, chainList));
   }
-  deleteRemovedNftsFromCollection(chainHash, address, collection, nftIds = []) {
-    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();
-  }
-  deleteNftsFromRemovedCollection(chain, address, collectionIds) {
+  cleanUpNfts(chain, address, collectionId, nftIds) {
     return this.table.where({
       address,
-      chain
-    }).and(nft => !collectionIds.some(item => item === nft.collectionId));
+      chain,
+      collectionId
+    }).and(nft => !nftIds.includes(nft.id)).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

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

@@ -1,45 +1,30 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { _getAssetDecimals, _getChainNativeTokenBasicInfo, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
 export 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 && !_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: _getAssetDecimals(sendingTokenInfo)
-          };
-          isFeeUseMainTokenSymbol = false;
-        }
-      }
-    }
     const {
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = _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
         };
@@ -48,28 +33,15 @@ export function parseXcmEventLogs(historyItem, eventLogs, chain, sendingTokenInf
   }
 }
 export 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) && !_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: _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: _getAssetDecimals(sendingTokenInfo)
           };
@@ -80,13 +52,13 @@ export function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTok
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = _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
         };