@subwallet/extension-base 1.1.51-2 → 1.1.52-0

package/koni/background/handlers/Extension.js

@@ -1036,11 +1036,11 @@ export default class KoniExtension {
     return this.getPrice();
   }
   async getBalance(reset) {
-    return this.#koniState.getBalance(reset);
+    return this.#koniState.balanceService.getBalance(reset);
   }
   async subscribeBalance(id, port) {
     const cb = createSubscription(id, port);
-    const balanceSubscription = this.#koniState.subscribeBalance().subscribe({
+    const balanceSubscription = this.#koniState.balanceService.subscribeBalanceMap().subscribe({
       next: rs => {
         const data = {
           details: rs
@@ -1565,12 +1565,13 @@ export default class KoniExtension {
         // TODO: review this
         chainType = ChainType.EVM;
         const txVal = transferAll ? freeBalance.value : value || '0';
+        const evmApi = evmApiMap[networkKey];
 
         // Estimate with EVM API
         if (_isTokenEvmSmartContract(tokenInfo) || _isLocalToken(tokenInfo)) {
-          [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApi);
         } else {
-          [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, from, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, from, to, txVal, !!transferAll, evmApi);
         }
       } else if (_isMantaZkAsset(tokenInfo)) {
         // TODO

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

@@ -23,7 +23,7 @@ import DatabaseService from '@subwallet/extension-base/services/storage-service/
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
-import { BalanceItem, BalanceJson, BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
+import { BalanceMap, EvmFeeInfo } from '@subwallet/extension-base/types';
 import { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import SimpleKeyring from 'eth-simple-keyring';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -38,7 +38,6 @@ export default class KoniState {
     private readonly unsubscriptionMap;
     private readonly accountRefStore;
     private externalRequest;
-    private balanceMap;
     private crowdloanMap;
     private crowdloanSubject;
     private nftSubject;
@@ -155,18 +154,8 @@ export default class KoniState {
     getAccountAddress(): string | null;
     getDecodedAddresses(address?: string): string[];
     getAllAddresses(): string[];
-    removeInactiveChainBalances(): Promise<void>;
-    getBalance(reset?: boolean): Promise<BalanceJson>;
-    getStoredBalance(address: string): Promise<BalanceItem[]>;
-    private isFirstLoad;
-    handleResetBalance(newAddress: string, forceRefresh?: boolean): Promise<void>;
     resetCrowdloanMap(newAddress: string): Promise<void>;
     resetStaking(newAddress: string): void;
-    private balanceUpdateCache;
-    /** Note: items must be same tokenSlug */
-    setBalanceItem(items: BalanceItem[]): void;
-    private updateBalanceStore;
-    subscribeBalance(): BehaviorSubject<BalanceMap>;
     getCrowdloan(reset?: boolean): CrowdloanJson;
     getStoredCrowdloan(address: string): Promise<Record<string, import("../../../services/storage-service/databases").ICrowdloanItem>>;
     setCrowdloanItem(networkKey: string, item: CrowdloanItem): void;

package/koni/background/handlers/State.js

@@ -7,7 +7,6 @@ import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/ba
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
-import { BalanceMapImpl } from '@subwallet/extension-base/services/balance-service/BalanceMapImpl';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
 import CampaignService from '@subwallet/extension-base/services/campaign-service';
@@ -32,7 +31,7 @@ import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subsca
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
-import { addLazy, isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
+import { isAccountAll, stripUrl, TARGET_ENV } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -66,7 +65,6 @@ export default class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new AccountRefStore();
   externalRequest = {};
-  balanceMap = new BalanceMapImpl();
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new Subject();
   nftSubject = new Subject();
@@ -226,6 +224,7 @@ export default class KoniState {
     await this.migrationService.run();
     this.campaignService.init();
     this.eventService.emit('chain.ready', true);
+    await this.balanceService.init();
     await this.earningService.init();
     this.onReady();
     this.onAccountAdd();
@@ -675,35 +674,6 @@ export default class KoniState {
   getAllAddresses() {
     return keyring.getAccounts().map(account => account.address);
   }
-  async removeInactiveChainBalances() {
-    const assetSettings = await this.chainService.getAssetSettings();
-    this.balanceMap.removeBalanceItemByFilter(item => {
-      return !assetSettings[item.tokenSlug];
-    });
-  }
-  async getBalance(reset) {
-    await this.removeInactiveChainBalances();
-    return {
-      details: this.balanceMap.map,
-      reset
-    };
-  }
-  async getStoredBalance(address) {
-    return await this.dbService.stores.balance.getBalanceMapByAddresses(address);
-  }
-  isFirstLoad = true;
-  async handleResetBalance(newAddress, forceRefresh) {
-    if (this.isFirstLoad) {
-      const backupBalanceData = await this.dbService.getStoredBalance();
-      this.balanceMap.updateBalanceItems(backupBalanceData, isAccountAll(newAddress));
-      this.isFirstLoad = false;
-    }
-    if (forceRefresh) {
-      this.balanceMap.setData({});
-      await this.dbService.stores.balance.clear();
-    }
-    await Promise.all([this.removeInactiveChainBalances()]);
-  }
   async resetCrowdloanMap(newAddress) {
     const defaultData = generateDefaultCrowdloanMap();
     const storedData = await this.getStoredCrowdloan(newAddress);
@@ -725,36 +695,6 @@ export default class KoniState {
       });
     });
   }
-  balanceUpdateCache = [];
-
-  /** Note: items must be same tokenSlug */
-  setBalanceItem(items) {
-    if (items.length) {
-      const nowTime = new Date().getTime();
-      for (const item of items) {
-        const balance = {
-          timestamp: nowTime,
-          ...item
-        };
-        this.balanceUpdateCache.push(balance);
-      }
-      addLazy('updateBalanceStore', () => {
-        const isAllAccount = isAccountAll(this.keyringService.currentAccount.address);
-        this.balanceMap.updateBalanceItems(this.balanceUpdateCache, isAllAccount);
-        if (isAllAccount) {
-          this.balanceUpdateCache = [...this.balanceUpdateCache, ...Object.values(this.balanceMap.map[ALL_ACCOUNT_KEY])];
-        }
-        this.updateBalanceStore(this.balanceUpdateCache);
-        this.balanceUpdateCache = [];
-      }, 300, 1800);
-    }
-  }
-  updateBalanceStore(items) {
-    this.dbService.updateBulkBalanceStore(items).catch(e => this.logger.warn(e));
-  }
-  subscribeBalance() {
-    return this.balanceMap.mapSubject;
-  }
   getCrowdloan(reset) {
     return {
       details: this.crowdloanMap,
@@ -1456,7 +1396,7 @@ export default class KoniState {
     // Stopping services
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.earningService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1488,7 +1428,7 @@ export default class KoniState {
     }
 
     // Start services
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.earningService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start()]);
 
     // Complete starting
     starting.resolve();
@@ -1534,11 +1474,6 @@ export default class KoniState {
 
       const stores = this.dbService.stores;
 
-      // Remove Balance
-      stores.balance.removeAllByAddress(address).catch(console.error);
-      stores.balance.removeAllByAddress(ALL_ACCOUNT_KEY).catch(console.error);
-      this.balanceMap.removeBalanceItems([address, ALL_ACCOUNT_KEY]);
-
       // Remove NFT
       stores.nft.deleteNftByAddress([address]).catch(console.error);
 
@@ -1556,7 +1491,7 @@ export default class KoniState {
     return true;
   }
   async reloadBalance() {
-    await this.subscription.reloadBalance();
+    await this.balanceService.reloadBalance();
     return true;
   }
   async reloadCrowdloan() {
@@ -1581,9 +1516,11 @@ export default class KoniState {
   }
   async resetWallet(resetAll) {
     await this.keyringService.resetWallet(resetAll);
+    await this.earningService.resetYieldPosition();
+    await this.balanceService.handleResetBalance(true);
     this.requestService.resetWallet();
     this.transactionService.resetWallet();
-    await this.handleResetBalance(ALL_ACCOUNT_KEY, true);
+    // await this.handleResetBalance(ALL_ACCOUNT_KEY, true);
     await this.earningService.resetWallet();
     await this.dbService.resetWallet(resetAll);
     this.accountRefStore.set('refList', []);
@@ -1696,7 +1633,7 @@ export default class KoniState {
         };
         balanceItem.free = ((_zkBalances$i = zkBalances[i]) === null || _zkBalances$i === void 0 ? void 0 : _zkBalances$i.toString()) || '0';
         balanceItem.state = APIItemState.READY;
-        this.setBalanceItem([balanceItem]);
+        this.balanceService.setBalanceItem([balanceItem]);
       }
     }).catch(console.warn);
   }

package/koni/background/subscription.d.ts

@@ -1,5 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { _ChainState, _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import KoniState from './handlers/State';
 declare type SubscriptionName = 'balance' | 'crowdloan' | 'yieldPoolStats' | 'yieldPosition';
@@ -16,14 +16,10 @@ export declare class KoniSubscription {
     stopAllSubscription(): void;
     start(): Promise<void>;
     stop(): Promise<void>;
-    subscribeBalances(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
     subscribeCrowdloans(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
-    initBalanceSubscription(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     initCrowdloanSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     subscribeNft(address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;
     initNftSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;
-    subscribeStakingReward(address: string): Promise<void>;
-    reloadBalance(): Promise<void>;
     reloadCrowdloan(): Promise<void>;
 }
 export {};

package/koni/background/subscription.js

@@ -2,10 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { subscribeCrowdloan } from '@subwallet/extension-base/koni/api/dotsama/crowdloan';
-import { getNominationStakingRewardData } from '@subwallet/extension-base/koni/api/staking';
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
-import { subscribeBalance } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/balance';
-import { _isChainEnabled, _isChainSupportSubstrateStaking } from '@subwallet/extension-base/services/chain-service/utils';
 import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { logger as createLogger } from '@polkadot/util';
@@ -47,7 +44,6 @@ export class KoniSubscription {
     await Promise.all([this.state.eventService.waitCryptoReady, this.state.eventService.waitKeyringReady, this.state.eventService.waitAssetReady]);
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
     if (currentAddress) {
-      this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     }
     this.eventHandler = (events, eventTypes) => {
@@ -61,7 +57,6 @@ export class KoniSubscription {
       if (!address) {
         return;
       }
-      this.subscribeBalances(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
       this.subscribeCrowdloans(address, serviceInfo.chainApiMap.substrate);
     };
     this.state.eventService.onLazy(this.eventHandler.bind(this));
@@ -74,15 +69,6 @@ export class KoniSubscription {
     this.stopAllSubscription();
     return Promise.resolve();
   }
-  subscribeBalances(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    const addresses = this.state.getDecodedAddresses(address);
-    if (!addresses.length) {
-      return;
-    }
-    this.state.handleResetBalance(address).then(() => {
-      this.updateSubscription('balance', this.initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime));
-    }).catch(err => this.logger.warn(err));
-  }
   subscribeCrowdloans(address, substrateApiMap, onlyRunOnFirstTime) {
     const addresses = this.state.getDecodedAddresses(address);
     if (!addresses.length) {
@@ -92,27 +78,6 @@ export class KoniSubscription {
       this.updateSubscription('crowdloan', this.initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
     }).catch(console.error);
   }
-  initBalanceSubscription(addresses, chainInfoMap, chainStateMap, substrateApiMap, evmApiMap, onlyRunOnFirstTime) {
-    const filteredChainInfoMap = {};
-    Object.values(chainStateMap).forEach(chainState => {
-      if (chainState.active) {
-        filteredChainInfoMap[chainState.slug] = chainInfoMap[chainState.slug];
-      }
-    });
-    const unsub = subscribeBalance(addresses, filteredChainInfoMap, substrateApiMap, evmApiMap, result => {
-      this.state.setBalanceItem(result);
-    });
-    const unsub2 = this.state.subscribeMantaPayBalance();
-    if (onlyRunOnFirstTime) {
-      unsub && unsub();
-      unsub2 && unsub2();
-      return;
-    }
-    return () => {
-      unsub && unsub();
-      unsub2 && unsub2();
-    };
-  }
   initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
     const subscriptionPromise = subscribeCrowdloan(addresses, substrateApiMap, (networkKey, rs) => {
       this.state.setCrowdloanItem(networkKey, rs);
@@ -139,33 +104,9 @@ export class KoniSubscription {
     nftHandler.setAddresses(addresses);
     nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).catch(this.logger.log);
   }
-  async subscribeStakingReward(address) {
-    const addresses = this.state.getDecodedAddresses(address);
-    if (!addresses.length) {
-      return;
-    }
-    const chainInfoMap = this.state.getChainInfoMap();
-    const targetNetworkMap = {};
-    Object.entries(chainInfoMap).forEach(([key, network]) => {
-      const chainState = this.state.getChainStateByKey(key);
-      if (_isChainEnabled(chainState) && _isChainSupportSubstrateStaking(network)) {
-        targetNetworkMap[key] = network;
-      }
-    });
-    await getNominationStakingRewardData(addresses, targetNetworkMap, rewardItem => {
-      this.state.updateStakingReward(rewardItem);
-    });
-  }
-  async reloadBalance() {
+  async reloadCrowdloan() {
     var _this$state$keyringSe2;
     const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
-    await this.state.handleResetBalance(currentAddress, true);
-    this.subscribeBalances(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
-    await waitTimeout(1800);
-  }
-  async reloadCrowdloan() {
-    var _this$state$keyringSe3;
-    const currentAddress = (_this$state$keyringSe3 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe3 === void 0 ? void 0 : _this$state$keyringSe3.address;
     this.subscribeCrowdloans(currentAddress, this.state.getSubstrateApiMap());
     await waitTimeout(1800);
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.51-2",
+  "version": "1.1.52-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -535,15 +535,20 @@
       "require": "./cjs/services/balance-service/BalanceMapImpl.js",
       "default": "./services/balance-service/BalanceMapImpl.js"
     },
+    "./services/balance-service/helpers": {
+      "types": "./services/balance-service/helpers/index.d.ts",
+      "require": "./cjs/services/balance-service/helpers/index.js",
+      "default": "./services/balance-service/helpers/index.js"
+    },
     "./services/balance-service/helpers/group": {
       "types": "./services/balance-service/helpers/group.d.ts",
       "require": "./cjs/services/balance-service/helpers/group.js",
       "default": "./services/balance-service/helpers/group.js"
     },
-    "./services/balance-service/helpers/subscribe/balance": {
-      "types": "./services/balance-service/helpers/subscribe/balance.d.ts",
-      "require": "./cjs/services/balance-service/helpers/subscribe/balance.js",
-      "default": "./services/balance-service/helpers/subscribe/balance.js"
+    "./services/balance-service/helpers/subscribe": {
+      "types": "./services/balance-service/helpers/subscribe/index.d.ts",
+      "require": "./cjs/services/balance-service/helpers/subscribe/index.js",
+      "default": "./services/balance-service/helpers/subscribe/index.js"
     },
     "./services/balance-service/helpers/subscribe/evm": {
       "types": "./services/balance-service/helpers/subscribe/evm.d.ts",
@@ -1531,9 +1536,9 @@
       "default": "./types/index.js"
     },
     "./types/balance": {
-      "types": "./types/balance.d.ts",
-      "require": "./cjs/types/balance.js",
-      "default": "./types/balance.js"
+      "types": "./types/balance/index.d.ts",
+      "require": "./cjs/types/balance/index.js",
+      "default": "./types/balance/index.js"
     },
     "./types/buy": {
       "types": "./types/buy.d.ts",
@@ -1670,6 +1675,11 @@
       "require": "./cjs/utils/array.js",
       "default": "./utils/array.js"
     },
+    "./utils/asset": {
+      "types": "./utils/asset.d.ts",
+      "require": "./cjs/utils/asset.js",
+      "default": "./utils/asset.js"
+    },
     "./utils/canDerive": {
       "types": "./utils/canDerive.d.ts",
       "require": "./cjs/utils/canDerive.js",
@@ -1806,11 +1816,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.53",
-    "@subwallet/extension-base": "^1.1.51-2",
-    "@subwallet/extension-chains": "^1.1.51-2",
-    "@subwallet/extension-dapp": "^1.1.51-2",
-    "@subwallet/extension-inject": "^1.1.51-2",
+    "@subwallet/chain-list": "0.2.54",
+    "@subwallet/extension-base": "^1.1.52-0",
+    "@subwallet/extension-chains": "^1.1.52-0",
+    "@subwallet/extension-dapp": "^1.1.52-0",
+    "@subwallet/extension-inject": "^1.1.52-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.51-2'
+  version: '1.1.52-0'
 };

package/services/balance-service/BalanceMapImpl.js

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import { groupBalance } from '@subwallet/extension-base/services/balance-service/helpers/group';
 import { isAccountAll } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
+import { groupBalance } from "./helpers/index.js";
 export class BalanceMapImpl {
   constructor(_map = {}) {
     this._map = _map;

package/services/balance-service/helpers/index.d.ts

@@ -0,0 +1,2 @@
+export * from './group';
+export * from './subscribe';

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

@@ -0,0 +1,5 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export * from "./group.js";
+export * from "./subscribe/index.js";

package/services/balance-service/helpers/subscribe/evm.d.ts

@@ -1,5 +1,3 @@
-import { _ChainAsset } from '@subwallet/chain-list/types';
-import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
-import { BalanceItem } from '@subwallet/extension-base/types';
-export declare function subscribeERC20Interval(addresses: string[], chain: string, evmApiMap: Record<string, _EvmApi>, callBack: (result: BalanceItem[]) => void): () => void;
-export declare function subscribeEVMBalance(chain: string, addresses: string[], evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem[]) => void, tokenInfo: _ChainAsset): () => void;
+import { SubscribeEvmPalletBalance } from '@subwallet/extension-base/types';
+export declare function subscribeERC20Interval({ addresses, assetMap, callback, chainInfo, evmApi }: SubscribeEvmPalletBalance): () => void;
+export declare function subscribeEVMBalance(params: SubscribeEvmPalletBalance): () => void;

package/services/balance-service/helpers/subscribe/evm.js

@@ -6,12 +6,22 @@ import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
 import { ASTAR_REFRESH_BALANCE_INTERVAL, SUB_TOKEN_REFRESH_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { getEVMBalance } from '@subwallet/extension-base/koni/api/tokens/evm/balance';
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
-import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { filterAssetsByChainAndType } from '@subwallet/extension-base/utils';
 import { BN } from '@polkadot/util';
-export function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
-  let tokenList = {};
+export function subscribeERC20Interval({
+  addresses,
+  assetMap,
+  callback,
+  chainInfo,
+  evmApi
+}) {
+  const chain = chainInfo.slug;
+  const tokenList = filterAssetsByChainAndType(assetMap, chain, [_AssetType.ERC20]);
   const erc20ContractMap = {};
+  Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
+    erc20ContractMap[slug] = getERC20Contract(_getContractAddressOfToken(tokenInfo), evmApi);
+  });
   const getTokenBalances = () => {
     Object.values(tokenList).map(async tokenInfo => {
       try {
@@ -34,40 +44,47 @@ export function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
             state: APIItemState.READY
           };
         });
-        callBack(items);
+        callback(items);
       } catch (err) {
         console.log(tokenInfo.slug, err);
       }
     });
   };
-  tokenList = state.getAssetByChainAndAsset(chain, [_AssetType.ERC20]);
-  Object.entries(tokenList).forEach(([slug, tokenInfo]) => {
-    erc20ContractMap[slug] = getERC20Contract(chain, _getContractAddressOfToken(tokenInfo), evmApiMap);
-  });
   getTokenBalances();
   const interval = setInterval(getTokenBalances, SUB_TOKEN_REFRESH_BALANCE_INTERVAL);
   return () => {
     clearInterval(interval);
   };
 }
-export function subscribeEVMBalance(chain, addresses, evmApiMap, callback, tokenInfo) {
+export function subscribeEVMBalance(params) {
+  var _Object$values$;
+  const {
+    addresses,
+    assetMap,
+    callback,
+    chainInfo,
+    evmApi
+  } = params;
+  const chain = chainInfo.slug;
+  const nativeTokenInfo = filterAssetsByChainAndType(assetMap, chain, [_AssetType.NATIVE]);
+  const nativeTokenSlug = ((_Object$values$ = Object.values(nativeTokenInfo)[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.slug) || '';
   function getBalance() {
-    getEVMBalance(chain, addresses, evmApiMap).then(balances => {
+    getEVMBalance(chain, addresses, evmApi).then(balances => {
       return balances.map((balance, index) => {
         return {
           address: addresses[index],
-          tokenSlug: tokenInfo.slug,
+          tokenSlug: nativeTokenSlug,
           state: APIItemState.READY,
           free: new BN(balance || '0').toString(),
           locked: '0'
         };
       });
     }).catch(e => {
-      console.error(`Error on get native balance with token ${tokenInfo.slug}`, e);
+      console.error(`Error on get native balance with token ${nativeTokenSlug}`, e);
       return addresses.map(address => {
         return {
           address: address,
-          tokenSlug: tokenInfo.slug,
+          tokenSlug: nativeTokenSlug,
           state: APIItemState.READY,
           free: '0',
           locked: '0'
@@ -79,7 +96,7 @@ export function subscribeEVMBalance(chain, addresses, evmApiMap, callback, token
   }
   getBalance();
   const interval = setInterval(getBalance, ASTAR_REFRESH_BALANCE_INTERVAL);
-  const unsub2 = subscribeERC20Interval(addresses, chain, evmApiMap, callback);
+  const unsub2 = subscribeERC20Interval(params);
   return () => {
     clearInterval(interval);
     unsub2 && unsub2();

package/services/balance-service/helpers/subscribe/{balance.d.ts → index.d.ts}

@@ -1,4 +1,4 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { AccountJson } from '@subwallet/extension-base/background/types';
 import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { BalanceItem } from '@subwallet/extension-base/types';
@@ -12,4 +12,4 @@ import { BalanceItem } from '@subwallet/extension-base/types';
  * @returns {AccountJson|null}  - Account info or null if not found
  */
 export declare const getAccountJsonByAddress: (address: string) => AccountJson | null;
-export declare function subscribeBalance(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem[]) => void): () => void;
+export declare function subscribeBalance(addresses: string[], chains: string[], tokens: string[], _chainAssetMap: Record<string, _ChainAsset>, _chainInfoMap: Record<string, _ChainInfo>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, callback: (rs: BalanceItem[]) => void): () => void;