@subwallet/extension-base 1.0.2-2 → 1.0.2-3

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

@@ -67,16 +67,7 @@ export default 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;
@@ -127,7 +118,8 @@ export default class EvmRequestHandler {
       data: toBuffer(config.data)
     };
     const common = Common.custom({
-      chainId: config.chainId
+      chainId: config.chainId,
+      defaultHardfork: 'petersburg'
     });
 
     // @ts-ignore
@@ -140,11 +132,15 @@ export default class EvmRequestHandler {
     const {
       estimateGas,
       from,
-      gasPrice
+      gas,
+      gasPrice,
+      value
     } = transaction;
     const pair = keyring.getPair(from);
     const params = {
       ...transaction,
+      gas: anyNumberToBN(gas).toNumber(),
+      value: anyNumberToBN(value).toNumber(),
       gasPrice: anyNumberToBN(gasPrice).toNumber(),
       gasLimit: anyNumberToBN(estimateGas).toNumber()
       // nonce: await web3.eth.getTransactionCount(from) // Todo: fill this value from transaction service

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

@@ -1,6 +1,7 @@
 import { AuthRequestV2, ConfirmationDefinitions, ConfirmationsQueue, ConfirmationsQueueItemOptions, ConfirmationType, RequestConfirmationComplete } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType, AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestSign, ResponseSigning, SigningRequest } from '@subwallet/extension-base/background/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
+import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import { AuthUrls, MetaRequest } from '@subwallet/extension-base/services/request-service/types';
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import { MetadataDef } from '@subwallet/extension-inject/types';
@@ -8,8 +9,9 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import { SignerPayloadJSON } from '@polkadot/types/types/extrinsic';
 export default class RequestService {
     #private;
+    private keyringService;
     readonly settingService: SettingService;
-    constructor(chainService: ChainService, settingService: SettingService);
+    constructor(chainService: ChainService, settingService: SettingService, keyringService: KeyringService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;
     getAddressList(value?: boolean): Record<string, boolean>;

package/services/request-service/index.js

@@ -6,7 +6,6 @@ import EvmRequestHandler from '@subwallet/extension-base/services/request-servic
 import MetadataRequestHandler from '@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler';
 import PopupHandler from '@subwallet/extension-base/services/request-service/handler/PopupHandler';
 import SubstrateRequestHandler from '@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler';
-import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 export default class RequestService {
   // Common
   #chainService;
@@ -17,12 +16,13 @@ export default class RequestService {
   #evmRequestHandler;
 
   // Common
-  constructor(chainService, settingService) {
+  constructor(chainService, settingService, keyringService) {
+    this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
     this.#popupHandler = new PopupHandler(this);
     this.#metadataRequestHandler = new MetadataRequestHandler(this);
-    this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService);
+    this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new SubstrateRequestHandler(this);
     this.#evmRequestHandler = new EvmRequestHandler(this);
 
@@ -36,7 +36,7 @@ export default class RequestService {
     this.#popupHandler.updateIconV2(shouldClose);
   }
   getAddressList(value = false) {
-    const addressList = Object.keys(accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -51,7 +51,16 @@ export default 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/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, collectionIds: string[], nftIds: string[], ownNothing?: boolean): 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');
-    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);
   }
 
   // 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,22 @@ export default class DatabaseService {
     });
     return this.nftSubscription;
   }
+  async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
+    if (ownNothing) {
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42));
+    }
+    const result = await this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionIds, nftIds);
+    result > 0 && console.debug(`Cleaned up ${result} NFTs on chain ${chain} for owner ${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
@@ -160,47 +174,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 +231,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,8 @@ 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, collectionIds: string[], nftIds: string[]): import("dexie").PromiseExtended<number>;
+    deleteNftsByChainAndOwner(chain: string, address: 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,17 @@ 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();
+  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/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
         };

package/services/transaction-service/index.js

@@ -180,7 +180,6 @@ export default class TransactionService {
     this.transactionSubject.next({
       ...transactions
     });
-    console.log(transaction);
 
     // Send transaction
     return await this.sendTransaction(transaction);
@@ -427,11 +426,11 @@ export default 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) && keyring.getAccount(historyItem.to);
+      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && keyring.getPair(historyItem.to);
       if (toAccount) {
         return [historyItem, {
           ...historyItem,
-          address: historyItem.to,
+          address: toAccount.address,
           direction: TransactionDirection.RECEIVED
         }];
       }
@@ -456,18 +455,27 @@ export default class TransactionService {
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
     const transaction = this.getTransaction(id);
-    switch (transaction.extrinsicType) {
-      case ExtrinsicType.SEND_NFT:
-        {
-          const inputData = parseTransactionData(transaction.data);
-          const sender = keyring.getAccount(inputData.senderAddress);
-          const recipient = keyring.getAccount(inputData.recipientAddress);
-          sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).catch(console.error);
-          recipient && this.databaseService.addNft(recipient.address, {
-            ...inputData.nftItem,
-            owner: recipient.address
-          }).catch(console.error);
-        }
+    if (transaction.extrinsicType === ExtrinsicType.SEND_NFT) {
+      const inputData = parseTransactionData(transaction.data);
+      try {
+        const sender = keyring.getPair(inputData.senderAddress);
+        sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
+          this.eventService.emit('transaction.transferNft', undefined);
+        }).catch(console.error);
+      } catch (e) {
+        console.error(e);
+      }
+      try {
+        const recipient = keyring.getPair(inputData.recipientAddress);
+        recipient && this.databaseService.addNft(recipient.address, {
+          ...inputData.nftItem,
+          owner: recipient.address
+        }).catch(console.error);
+      } catch (e) {
+        console.error(e);
+      }
+    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
+      this.eventService.emit('transaction.submitStaking', transaction.chain);
     }
   }
   onSuccess({
@@ -576,6 +584,9 @@ export default class TransactionService {
       payload.isToContract = isToContract;
       payload.parseData = isToContract ? payload.data ? (await parseContractInput(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
     }
+    if ('data' in payload && payload.data === undefined) {
+      delete payload.data;
+    }
 
     // Set unique nonce to avoid transaction errors
     if (!payload.nonce) {

package/utils/address.d.ts

@@ -1,2 +1,5 @@
+import { AddressJson } from '@subwallet/extension-base/background/types';
+import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 export declare const simpleAddress: (address: string) => string;
 export declare function quickFormatAddressToCompare(address?: string): string | undefined;
+export declare const convertSubjectInfoToAddresses: (subjectInfo: SubjectInfo) => AddressJson[];

package/utils/address.js

@@ -14,4 +14,11 @@ export function quickFormatAddressToCompare(address) {
     return address;
   }
   return reformatAddress(address, 42).toLowerCase();
-}
+}
+export const convertSubjectInfoToAddresses = subjectInfo => {
+  return Object.values(subjectInfo).map(info => ({
+    address: info.json.address,
+    type: info.type,
+    ...info.json.meta
+  }));
+};

package/utils/index.d.ts

@@ -8,7 +8,7 @@ export declare const isDef: (x: any) => boolean;
 export declare const nonEmptyArr: (x: any) => boolean;
 export declare const isEmptyArray: (x: any) => boolean;
 export declare function isAccountAll(address?: string): boolean;
-export declare function reformatAddress(address: string, networkPrefix: number, isEthereum?: boolean): string;
+export declare function reformatAddress(address: string, networkPrefix?: number, isEthereum?: boolean): string;
 export declare function filterAddressByNetworkKey(addresses: string[], networkKey: string, isEthereum?: boolean): string[];
 export declare function categoryAddresses(addresses: string[]): string[][];
 export declare function categoryNetworks(networks: NetworkJson[]): string[][];
@@ -34,6 +34,6 @@ export declare function mergeNetworkProviders(customNetwork: NetworkJson, predef
 };
 export declare const filterAndSortingAccountByAuthType: (accounts: AccountJson[], accountAuthType: AccountAuthType, sorting?: boolean) => AccountJson[];
 export declare function parseRawNumber(value: string): number;
-export declare function parseNumberToDisplay(amount: BN, decimals: number | undefined): string;
 export declare function isSameAddress(address1: string, address2: string): boolean;
 export declare function getDomainFromUrl(url: string): string;
+export declare function waitTimeout(ms: number): Promise<void>;

package/utils/index.js

@@ -3,7 +3,6 @@
 
 import { CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import BigNumber from 'bignumber.js';
 import { BN, hexToU8a, isHex } from '@polkadot/util';
 import { decodeAddress, encodeAddress, ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export { canDerive } from "./canDerive.js";
@@ -14,7 +13,7 @@ export const isEmptyArray = x => !Array.isArray(x) || Array.isArray(x) && x.leng
 export function isAccountAll(address) {
   return address === ALL_ACCOUNT_KEY;
 }
-export function reformatAddress(address, networkPrefix, isEthereum = false) {
+export function reformatAddress(address, networkPrefix = 42, isEthereum = false) {
   try {
     if (isEthereumAddress(address)) {
       return address;
@@ -264,21 +263,16 @@ export const filterAndSortingAccountByAuthType = (accounts, accountAuthType, sor
 export function parseRawNumber(value) {
   return parseFloat(value.replaceAll(',', ''));
 }
-export function parseNumberToDisplay(amount, decimals) {
-  if (!decimals) {
-    return '0';
-  }
-  const parsedAmount = parseRawNumber(amount.toString());
-  const bigN = new BigNumber(parsedAmount / 10 ** decimals);
-  const roundedString = bigN.toFixed(9);
-  const formattedString = parseFloat(roundedString); // remove excess zeros at the end
-
-  return formattedString.toString();
-}
 export function isSameAddress(address1, address2) {
+  if (isEthereumAddress(address1)) {
+    return address1.toLowerCase() === address2.toLowerCase();
+  }
   return reformatAddress(address1, 0) === reformatAddress(address2, 0); // TODO: maybe there's a better way
 }
 
 export function getDomainFromUrl(url) {
   return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];
+}
+export async function waitTimeout(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
 }