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

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

@@ -286,7 +286,7 @@ class ChainService {
     this.dbService.removeFromChainStore([slug]).catch(console.error);
     this.updateChainSubscription();
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.updateState', slug);
+    this.eventService.emit('chain.remove', slug);
     return true;
   }
   resetChainInfoMap(excludedChains) {
@@ -352,7 +352,7 @@ class ChainService {
     this.dbService.removeFromAssetStore(targetAssets).catch(e => this.logger.error(e));
     this.assetRegistrySubject.next(assetRegistry);
     targetAssets.forEach(assetSlug => {
-      this.eventService.emit('asset.updateState', assetSlug);
+      this.eventService.emit('asset.remove', assetSlug);
     });
   }
 
@@ -426,7 +426,7 @@ class ChainService {
       currentProvider: chainStateMap[chainSlug].currentProvider
     }).catch(console.error);
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.updateState', chainSlug);
+    this.eventService.emit('chain.enable', chainSlug);
     return true;
   }
   enableChain(chainSlug) {
@@ -461,7 +461,7 @@ class ChainService {
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
-    this.eventService.emit('chain.updateState', chainSlug);
+    this.eventService.emit('chain.disable', chainSlug);
     return true;
   }
   checkExistedPredefinedChain(genesisHash, evmChainId) {
@@ -685,7 +685,7 @@ class ChainService {
       active: targetChainState.active,
       currentProvider: targetChainState.currentProvider
     }).then(() => {
-      this.eventService.emit('chain.updateState', chainSlug);
+      this.eventService.emit('chain.update', chainSlug);
     }).catch(e => this.logger.error(e));
   }
   insertChain(params) {
@@ -1120,6 +1120,7 @@ class ChainService {
       this.setAssetSettings(assetSettings, false);
     }
     this.eventService.emit('asset.ready', true);
+    console.log('Done init asset settings');
   }
   setAssetSettings(assetSettings) {
     let emitEvent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@@ -1134,7 +1135,7 @@ class ChainService {
     }
     this.assetSettingSubject.next(assetSettings);
     updateAssets.forEach(slug => {
-      this.eventService.emit('asset.updateState', slug);
+      this.eventService.emit(assetSettings[slug].visible ? 'asset.enable' : 'asset.disable', slug);
     });
     this.store.set('AssetSetting', assetSettings);
   }

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

@@ -42,11 +42,7 @@ class EventService extends _eventemitter.default {
     }, this.lazyTime);
   }
   emitLazy() {
-    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.lazyEmitter.emit('lazy', this.pendingEvents, this.pendingEvents.map(e => e.type));
     this.pendingEvents = [];
     this.timeoutId = null;
   }

package/cjs/services/event-service/types.js

@@ -1,11 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.COMMON_RELOAD_EVENTS = void 0;
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-const COMMON_RELOAD_EVENTS = ['account.updateCurrent', 'asset.updateState', 'account.add', 'chain.updateState', 'account.remove', 'chain.add'];
-exports.COMMON_RELOAD_EVENTS = COMMON_RELOAD_EVENTS;
+"use strict";

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.HistoryService = void 0;
 var _constants = require("@subwallet/extension-base/constants");
+var _address = require("@subwallet/extension-base/utils/address");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _accounts = require("@subwallet/ui-keyring/observable/accounts");
 var _rxjs = require("rxjs");
@@ -56,7 +57,7 @@ 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()];
     });
-    await this.addHistoryItems(historyRecords);
+    this.dbService.upsertHistory(historyRecords).catch(console.error);
     return historyRecords;
   }
   async fetchHistories(addresses) {
@@ -81,8 +82,8 @@ class HistoryService {
     const addressList = _uiKeyring.keyring.getAccounts().map(a => a.address);
     const currentHistories = this.historySubject.value;
     if (!this.fetchPromise || currentHistories.length === 0) {
-      await this.fetchHistories(addressList);
-      this.historySubject.next(await this.dbService.getHistories());
+      const historyRecords = await this.fetchHistories(addressList);
+      this.historySubject.next(historyRecords);
     }
     return this.historySubject.getValue();
   }
@@ -90,6 +91,10 @@ 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,
@@ -103,25 +108,14 @@ 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}-${item.extrinsicHash}`;
+      return `${item.chain}-${(0, _address.quickFormatAddressToCompare)(item.address) || ''}-${item.extrinsicHash}`;
     });
     const updateRecords = historyItems.filter(item => {
-      const key = `${item.chain}-${item.extrinsicHash}`;
-
-      // !excludeKeys.includes(key) && console.log('Cancel update', key);
-
+      const key = `${item.chain}-${(0, _address.quickFormatAddressToCompare)(item.address) || ''}-${item.extrinsicHash}`;
       return item.origin === 'app' || !excludeKeys.includes(key);
     });
     await this.dbService.upsertHistory(updateRecords);

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

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

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

@@ -24,6 +24,7 @@ const getTokenPrice = async function (priceIds) {
       }
     }
     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.default.get(`https://chain-data.subwallet.app/api/price/get?ids=${idStr}`);
     }

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

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

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

@@ -95,11 +95,11 @@ class AuthRequestHandler {
     const chainInfoMaps = this.#chainService.getChainInfoMap();
     const chainStateMap = this.#chainService.getChainStateMap();
     let defaultChain = options.defaultChain;
-    let needEnableChains = [];
+    const needEnableChains = [];
     if (options.url) {
       const domain = (0, _utils2.getDomainFromUrl)(options.url);
       const predefinedSupportChains = _constants.PREDEFINED_CHAIN_DAPP_CHAIN_MAP[domain];
-      if (!defaultChain && predefinedSupportChains) {
+      if (predefinedSupportChains) {
         defaultChain = predefinedSupportChains[0];
         options.autoActive && needEnableChains.push(...predefinedSupportChains);
       }
@@ -117,10 +117,6 @@ 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/cjs/services/storage-service/DatabaseService.js

@@ -10,7 +10,6 @@ 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
@@ -55,8 +54,7 @@ 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
@@ -71,16 +69,14 @@ 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);
     }
   }
@@ -88,23 +84,22 @@ 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) {
-    // this.logger.log('Get Stakings: ', stakings);
-
-    return this.stores.staking.getStakings(addresses, chains);
+    const stakings = await this.stores.staking.getStakings(addresses, chains);
+    this.logger.log('Get Stakings: ', stakings);
+    return stakings;
   }
   async getStakingsByChains(chains) {
     return this.stores.staking.getStakingsByChains(chains);
   }
   async getPooledStakings(addresses, chainHashes) {
-    // this.logger.log('Get Pooled Stakings: ', stakings);
-
-    return this.stores.staking.getPooledStakings(addresses, chainHashes);
+    const stakings = await this.stores.staking.getPooledStakings(addresses, chainHashes);
+    this.logger.log('Get Pooled Stakings: ', stakings);
+    return stakings;
   }
   subscribeStaking(addresses, chainList, callback) {
     this.stakingSubscription && this.stakingSubscription.unsubscribe();
@@ -126,18 +121,18 @@ class DatabaseService {
 
   // Transaction histories
   async getHistories(query) {
-    return this.stores.transaction.queryHistory(query);
+    const histories = await this.stores.transaction.queryHistory(query);
+    this.logger.log('Get histories: ', histories);
+    return histories;
   }
   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) {
@@ -156,19 +151,13 @@ class DatabaseService {
     });
     return this.nftSubscription;
   }
-  async cleanUpNft(chain, owner, collectionId, nftIds) {
-    const result = await this.stores.nft.cleanUpNfts(chain, (0, _utils.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) {
-    // this.logger.log('Get NFTs: ', nfts);
-
-    return this.stores.nft.getNft(addresses, chainHashes);
+    const nfts = await this.stores.nft.getNft(addresses, chainHashes);
+    this.logger.log('Get NFTs: ', nfts);
+    return nfts;
   }
   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
@@ -178,54 +167,47 @@ 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() {
-    // this.logger.log('Get all chains: ', allChains);
-
-    return this.stores.chain.getAll();
+    const allChains = await this.stores.chain.getAll();
+    this.logger.log('Get all chains: ', allChains);
+    return allChains;
   }
 
   // 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() {
-    // this.logger.log('Get all stored assets: ', allAssets);
-
-    return this.stores.asset.getAll();
+    const allAssets = await this.stores.asset.getAll();
+    this.logger.log('Get all stored assets: ', allAssets);
+    return allAssets;
   }
   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() {
@@ -236,8 +218,7 @@ 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,12 +24,25 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     return (0, _dexie.liveQuery)(() => this.getNft(addresses, chainList));
   }
-  cleanUpNfts(chain, address, collectionId, nftIds) {
+  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();
+  }
+  deleteNftsFromRemovedCollection(chain, address, collectionIds) {
     return this.table.where({
       address,
-      chain,
-      collectionId
-    }).and(nft => !nftIds.includes(nft.id)).delete();
+      chain
+    }).and(nft => !collectionIds.some(item => item === nft.collectionId));
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

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

@@ -10,28 +10,43 @@ 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 (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;
+    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;
         historyItem.fee = {
-          value: (_record$event$data$2 = record.event.data[1]) === null || _record$event$data$2 === void 0 ? void 0 : _record$event$data$2.toString(),
+          value: (_record$event$data$3 = record.event.data[1]) === null || _record$event$data$3 === void 0 ? void 0 : _record$event$data$3.toString(),
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };
       }
-    } 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;
+    } 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;
         historyItem.fee = {
-          value: (_record$event$data$4 = record.event.data[2]) === null || _record$event$data$4 === void 0 ? void 0 : _record$event$data$4.toString(),
+          value: (_record$event$data$5 = record.event.data[2]) === null || _record$event$data$5 === void 0 ? void 0 : _record$event$data$5.toString(),
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };
@@ -40,15 +55,28 @@ 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 (['genshiro_testnet', 'genshiro', 'equilibrium_parachain'].includes(chain) && sendingTokenInfo) {
-      if (record.event.section === 'transactionPayment' && record.event.method.toLowerCase() === 'transactionfeepaid') {
-        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()) {
+    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[1]) === null || _record$event$data$6 === void 0 ? void 0 : _record$event$data$6.toString()) || '0',
+            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 (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;
+          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',
             symbol: sendingTokenInfo.symbol,
             decimals: (0, _utils._getAssetDecimals)(sendingTokenInfo)
           };
@@ -59,13 +87,13 @@ function parseTransferEventLogs(historyItem, eventLogs, chain, sendingTokenInfo,
       decimals: nativeDecimals,
       symbol: nativeSymbol
     } = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-    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;
+    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;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         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$10 = record.event.data[1]) === null || _record$event$data$10 === void 0 ? void 0 : _record$event$data$10.toString()) || '0',
           symbol: nativeSymbol,
           decimals: nativeDecimals
         };

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

@@ -434,11 +434,11 @@ class TransactionService {
     }
     try {
       // Return one more history record if transaction send to account in the wallets
-      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && _uiKeyring.default.getPair(historyItem.to);
+      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && _uiKeyring.default.getAccount(historyItem.to);
       if (toAccount) {
         return [historyItem, {
           ...historyItem,
-          address: toAccount.address,
+          address: historyItem.to,
           direction: _KoniTypes.TransactionDirection.RECEIVED
         }];
       }
@@ -464,27 +464,18 @@ class TransactionService {
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
     const transaction = this.getTransaction(id);
-    if (transaction.extrinsicType === _KoniTypes.ExtrinsicType.SEND_NFT) {
-      const inputData = (0, _utils2.parseTransactionData)(transaction.data);
-      try {
-        const sender = _uiKeyring.default.getPair(inputData.senderAddress);
-        sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, _constants.ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
-          this.eventService.emit('transaction.transferNft', undefined);
-        }).catch(console.error);
-      } catch (e) {
-        console.error(e);
-      }
-      try {
-        const recipient = _uiKeyring.default.getPair(inputData.recipientAddress);
-        recipient && this.databaseService.addNft(recipient.address, {
-          ...inputData.nftItem,
-          owner: recipient.address
-        }).catch(console.error);
-      } catch (e) {
-        console.error(e);
-      }
-    } else if ([_KoniTypes.ExtrinsicType.STAKING_BOND, _KoniTypes.ExtrinsicType.STAKING_UNBOND, _KoniTypes.ExtrinsicType.STAKING_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_CANCEL_UNSTAKE, _KoniTypes.ExtrinsicType.STAKING_CLAIM_REWARD, _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL, _KoniTypes.ExtrinsicType.STAKING_POOL_WITHDRAW, _KoniTypes.ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
-      this.eventService.emit('transaction.submitStaking', transaction.chain);
+    switch (transaction.extrinsicType) {
+      case _KoniTypes.ExtrinsicType.SEND_NFT:
+        {
+          const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+          const sender = _uiKeyring.default.getAccount(inputData.senderAddress);
+          const recipient = _uiKeyring.default.getAccount(inputData.recipientAddress);
+          sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, _constants.ALL_ACCOUNT_KEY], inputData.nftItem).catch(console.error);
+          recipient && this.databaseService.addNft(recipient.address, {
+            ...inputData.nftItem,
+            owner: recipient.address
+          }).catch(console.error);
+        }
     }
   }
   onSuccess(_ref2) {