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

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

@@ -286,13 +286,7 @@ class ChainService {
     return destinationTokenInfo;
   }
   getAssetByChainAndType(chainSlug, assetTypes) {
-    const result = {};
-    Object.values(this.getAssetRegistry()).forEach(assetInfo => {
-      if (assetTypes.includes(assetInfo.assetType) && assetInfo.originChain === chainSlug) {
-        result[assetInfo.slug] = assetInfo;
-      }
-    });
-    return result;
+    return (0, _utils2.filterAssetsByChainAndType)(this.getAssetRegistry(), chainSlug, assetTypes);
   }
   getSmartContractNfts() {
     const result = [];
@@ -470,7 +464,7 @@ class ChainService {
   stopCheckLatestChainData() {
     clearInterval(this.refreshLatestChainDataTimeOut);
   }
-  handleLatestProviderData(latestChainInfo) {
+  handleLatestChainData(latestChainInfo) {
     try {
       if (latestChainInfo && latestChainInfo.length > 0) {
         const {
@@ -548,6 +542,17 @@ class ChainService {
           this.assetLogoMapSubject.next(logoMap);
         }
       }
+      if (latestAssetLogoMap) {
+        const latestAssetLogoPatch = JSON.stringify(latestAssetLogoMap);
+        if (this.assetLogoPatch !== latestAssetLogoPatch) {
+          const logoMap = {
+            ..._chainList.AssetLogoMap,
+            ...latestAssetLogoMap
+          };
+          this.assetLogoPatch = latestAssetLogoPatch;
+          this.assetLogoMapSubject.next(logoMap);
+        }
+      }
     } catch (e) {
       console.error('Error fetching latest asset data');
     }
@@ -567,8 +572,6 @@ class ChainService {
       const chainState = chainStateMap[originChain];
       if (!assetState) {
         // If this asset not has asset setting, this token is not enabled before (not turned off before)
-        // @ts-ignore
-        // TODO: Merge issue detect balance to define manualTurnOff props
         if (!chainState || !chainState.manualTurnOff) {
           await this.updateAssetSetting(assetSlug, {
             visible: true
@@ -585,7 +588,7 @@ class ChainService {
       }).catch(console.error);
     }).catch(console.error);
     this.fetchLatestChainData().then(latestChainInfo => {
-      this.handleLatestProviderData(latestChainInfo);
+      this.handleLatestChainData(latestChainInfo);
     }).catch(console.error);
     this.fetchLatestAssetRef().then(_ref7 => {
       let [latestAssetRef, latestAssetRefMap] = _ref7;
@@ -665,7 +668,8 @@ class ChainService {
     this.dbService.updateChainStore({
       ...chainInfo,
       active: true,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
     }).catch(console.error);
     chainStateMap[chainSlug].active = true;
     await this.initApiForChain(chainInfo);
@@ -690,7 +694,8 @@ class ChainService {
         this.dbService.updateChainStore({
           ...chainInfo,
           active: true,
-          currentProvider: chainStateMap[chainSlug].currentProvider
+          currentProvider: chainStateMap[chainSlug].currentProvider,
+          manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
         }).catch(console.error);
         chainStateMap[chainSlug].active = true;
         await this.initApiForChain(chainInfo);
@@ -717,13 +722,15 @@ class ChainService {
     }
     this.lockChainInfoMap = true;
     chainStateMap[chainSlug].active = false;
+    chainStateMap[chainSlug].manualTurnOff = true;
     // Set disconnect state for inactive chain
     this.updateChainConnectionStatus(chainSlug, _types3._ChainConnectionStatus.DISCONNECTED);
     this.destroyApiForChain(chainInfo);
     this.dbService.updateChainStore({
       ...chainInfo,
       active: false,
-      currentProvider: chainStateMap[chainSlug].currentProvider
+      currentProvider: chainStateMap[chainSlug].currentProvider,
+      manualTurnOff: true
     }).catch(console.error);
     this.updateChainStateMapSubscription();
     this.lockChainInfoMap = false;
@@ -815,7 +822,8 @@ class ChainService {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: providerKey,
           slug: chainInfo.slug,
-          active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug)
+          active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
+          manualTurnOff: false
         };
         this.updateChainConnectionStatus(chainInfo.slug, _types3._ChainConnectionStatus.DISCONNECTED);
 
@@ -823,13 +831,15 @@ class ChainService {
         newStorageData.push({
           ...chainInfo,
           active: _constants._DEFAULT_ACTIVE_CHAINS.includes(chainInfo.slug),
-          currentProvider: providerKey
+          currentProvider: providerKey,
+          manualTurnOff: false
         });
       });
     } else {
       const mergedChainInfoMap = defaultChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         const chainInfo = defaultChainInfoMap[storedSlug];
+        const manualTurnOff = !!storedChainInfo.manualTurnOff;
 
         // Network existed on change list
         // check predefined chains first, keep setting for providers and currentProvider
@@ -868,13 +878,15 @@ class ChainService {
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: selectedProvider,
             slug: storedSlug,
-            active: canActive && storedChainInfo.active
+            active: canActive && storedChainInfo.active,
+            manualTurnOff
           };
           this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: canActive && storedChainInfo.active,
-            currentProvider: selectedProvider
+            currentProvider: selectedProvider,
+            manualTurnOff
           });
         } else if ((0, _utils._isCustomChain)(storedSlug)) {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
@@ -890,13 +902,15 @@ class ChainService {
             this.dataMap.chainStateMap[duplicatedDefaultSlug] = {
               currentProvider: storedChainInfo.currentProvider,
               slug: duplicatedDefaultSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(duplicatedDefaultSlug, _types3._ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[duplicatedDefaultSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider
+              currentProvider: storedChainInfo.currentProvider,
+              manualTurnOff
             });
             deprecatedChainMap[storedSlug] = duplicatedDefaultSlug;
             deprecatedChains.push(storedSlug);
@@ -917,13 +931,16 @@ class ChainService {
               currentProvider: storedChainInfo.currentProvider,
               // TODO: review
               slug: storedSlug,
-              active: storedChainInfo.active
+              active: storedChainInfo.active,
+              manualTurnOff
             };
             this.updateChainConnectionStatus(storedSlug, _types3._ChainConnectionStatus.DISCONNECTED);
             newStorageData.push({
               ...mergedChainInfoMap[storedSlug],
               active: storedChainInfo.active,
-              currentProvider: storedChainInfo.currentProvider // TODO: review
+              currentProvider: storedChainInfo.currentProvider,
+              // TODO: review
+              manualTurnOff
             });
           }
         } else {
@@ -938,13 +955,15 @@ class ChainService {
           this.dataMap.chainStateMap[slug] = {
             currentProvider: Object.keys(chainInfo.providers)[0],
             slug,
-            active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug)
+            active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug),
+            manualTurnOff: false
           };
           this.updateChainConnectionStatus(slug, _types3._ChainConnectionStatus.DISCONNECTED);
           newStorageData.push({
             ...mergedChainInfoMap[slug],
             active: _constants._DEFAULT_ACTIVE_CHAINS.includes(slug),
-            currentProvider: Object.keys(chainInfo.providers)[0]
+            currentProvider: Object.keys(chainInfo.providers)[0],
+            manualTurnOff: false
           });
         }
       });
@@ -1061,7 +1080,8 @@ class ChainService {
     this.dbService.updateChainStore({
       ...targetChainInfo,
       active: targetChainState.active,
-      currentProvider: targetChainState.currentProvider
+      currentProvider: targetChainState.currentProvider,
+      manualTurnOff: !targetChainState.active || !!targetChainState.manualTurnOff
     }).then(() => {
       this.eventService.emit('chain.updateState', chainSlug);
     }).catch(e => this.logger.error(e));
@@ -1125,7 +1145,8 @@ class ChainService {
     chainStateMap[newChainSlug] = {
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
-      slug: newChainSlug
+      slug: newChainSlug,
+      manualTurnOff: false
     };
 
     // const chainStatusMap = this.getChainStatusMap();
@@ -1160,6 +1181,7 @@ class ChainService {
     this.dbService.updateChainStore({
       active: true,
       currentProvider: params.chainEditInfo.currentProvider,
+      manualTurnOff: false,
       ...chainInfo
     }).then(() => {
       this.eventService.emit('chain.add', newChainSlug);
@@ -1599,5 +1621,17 @@ class ChainService {
     });
     return result;
   }
+  get detectBalanceChainSlugMap() {
+    const result = {};
+    const chainInfoMap = this.getChainInfoMap();
+    for (const [key, chainInfo] of Object.entries(chainInfoMap)) {
+      var _chainInfo$extraInfo;
+      const chainBalanceSlug = ((_chainInfo$extraInfo = chainInfo.extraInfo) === null || _chainInfo$extraInfo === void 0 ? void 0 : _chainInfo$extraInfo.chainBalanceSlug) || '';
+      if (chainBalanceSlug) {
+        result[chainBalanceSlug] = key;
+      }
+    }
+    return result;
+  }
 }
 exports.ChainService = ChainService;

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

@@ -562,10 +562,11 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
   const currentChainStateMap = currentDataMap.chainStateMap;
   const storedChainInfoList = [];
   const needUpdateChainApiList = [];
-  latestChainInfoList.forEach(latestChainInfo => {
+  for (const latestChainInfo of latestChainInfoList) {
     const currentChainInfo = currentChainInfoMap[latestChainInfo.slug];
     const currentChainState = currentChainStateMap[latestChainInfo.slug];
     const currentChainProviderValue = currentChainInfo === null || currentChainInfo === void 0 ? void 0 : currentChainInfo.providers[currentChainState === null || currentChainState === void 0 ? void 0 : currentChainState.currentProvider];
+    let needUpdate = false;
     if (currentChainInfo && currentChainState) {
       const preservedProvider = {};
       Object.entries(currentChainInfo.providers).forEach(_ref => {
@@ -587,12 +588,19 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
         currentChainState.currentProvider = providerKey;
         needUpdateChainApiList.push(currentChainInfo);
       }
+      needUpdate = true;
+    }
+    if (currentChainInfo) {
+      needUpdate = true;
+      currentChainInfo.extraInfo = latestChainInfo.extraInfo;
+    }
+    if (needUpdate) {
       storedChainInfoList.push({
         ...currentChainInfo,
         ...currentChainState
       });
     }
-  });
+  }
   return {
     storedChainInfoList,
     needUpdateChainApiList

package/cjs/services/chain-service/utils/patch.js

@@ -12,7 +12,7 @@ var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
-const ChainListVersion = '0.2.53';
+const ChainListVersion = '0.2.54';
 async function fetchPatchData(slug) {
   try {
     const fetchPromise = (0, _crossFetch.default)(`${fetchDomain}/patch/${ChainListVersion}/${slug}`);

package/cjs/services/earning-service/handlers/liquid-staking/stella-swap.js

@@ -201,7 +201,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     const derivativeTokenInfo = this.state.getAssetBySlug(derivativeTokenSlug);
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
-    const inputTokenContract = (0, _web.getERC20Contract)(this.chain, (0, _utils._getContractAddressOfToken)(inputTokenInfo), this.state.getEvmApiMap());
+    const inputTokenContract = (0, _web.getERC20Contract)((0, _utils._getContractAddressOfToken)(inputTokenInfo), evmApi);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
     const allowanceCall = inputTokenContract.methods.allowance(params.address, (0, _utils._getContractAddressOfToken)(derivativeTokenInfo));
     const [allowance, gasPrice] = await Promise.all([
@@ -266,7 +266,7 @@ class StellaSwapLiquidStakingPoolHandler extends _base.default {
     const derivativeTokenInfo = this.state.getAssetBySlug(this.derivativeAssets[0]);
     const derivativeTokenContractAddress = (0, _utils._getContractAddressOfToken)(derivativeTokenInfo);
     const evmApi = this.evmApi;
-    const inputTokenContract = (0, _web.getERC20Contract)(this.chain, (0, _utils._getContractAddressOfToken)(inputTokenInfo), this.state.getEvmApiMap());
+    const inputTokenContract = (0, _web.getERC20Contract)((0, _utils._getContractAddressOfToken)(inputTokenInfo), evmApi);
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
     const approveCall = inputTokenContract.methods.approve(derivativeTokenContractAddress, MAX_INT); // TODO: need test

package/cjs/services/earning-service/handlers/native-staking/para-chain.js

@@ -156,7 +156,7 @@ class ParaNativeStakingPoolHandler extends _basePara.default {
         for (const scheduledRequest of delegationScheduledRequests) {
           if ((0, _utils3.reformatAddress)(scheduledRequest.delegator, 0) === (0, _utils3.reformatAddress)(address, 0)) {
             // add network prefix
-            const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
+            const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
             const remainingEra = scheduledRequest.whenExecutable - currentRound;
             const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chainInfo.slug];
             const claimable = Object.values(scheduledRequest.action)[0];

package/cjs/services/migration-service/scripts/AutoEnableChainsTokens.js

@@ -13,7 +13,7 @@ var _uiKeyring = require("@subwallet/ui-keyring");
 class AutoEnableChainsTokens extends _Base.default {
   async run() {
     const accounts = _uiKeyring.keyring.getAccounts();
-    await this.state.autoEnableChains(accounts.map(_ref => {
+    await this.state.balanceService.autoEnableChains(accounts.map(_ref => {
       let {
         address
       } = _ref;

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

@@ -15,6 +15,7 @@ var _NominatorMetadata = _interopRequireDefault(require("@subwallet/extension-ba
 var _YieldPoolStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/YieldPoolStore"));
 var _YieldPositionStore = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/db-stores/YieldPositionStore"));
 var _utils = require("@subwallet/extension-base/utils");
+var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _dexieExportImport = require("dexie-export-import");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -71,7 +72,15 @@ class DatabaseService {
 
   // Balance
   async getStoredBalance() {
-    return this.stores.balance.table.toArray();
+    const addresses = _uiKeyring.default.getPairs().map(_ref => {
+      let {
+        address
+      } = _ref;
+      return address;
+    });
+
+    // Filter not exist address
+    return this.stores.balance.table.filter(obj => addresses.includes(obj.address)).toArray();
   }
   async updateBalanceStore(item) {
     if (item.state === _KoniTypes.APIItemState.READY) {

package/cjs/stores/DetectAccountBalance.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defaults = require("@subwallet/extension-base/defaults");
+var _SubscribableStore = _interopRequireDefault(require("@subwallet/extension-base/stores/SubscribableStore"));
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class DetectAccountBalanceStore extends _SubscribableStore.default {
+  constructor() {
+    super(_defaults.EXTENSION_PREFIX ? `${_defaults.EXTENSION_PREFIX}DetectBalanceCache` : null);
+  }
+}
+exports.default = DetectAccountBalanceStore;

package/cjs/utils/asset.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterAssetsByChainAndType = void 0;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const filterAssetsByChainAndType = (chainAssetMap, chain, assetTypes) => {
+  const result = {};
+  Object.values(chainAssetMap).forEach(assetInfo => {
+    if (assetTypes.includes(assetInfo.assetType) && assetInfo.originChain === chain) {
+      result[assetInfo.slug] = assetInfo;
+    }
+  });
+  return result;
+};
+exports.filterAssetsByChainAndType = filterAssetsByChainAndType;

package/cjs/utils/index.js

@@ -104,6 +104,18 @@ Object.keys(_array).forEach(function (key) {
     }
   });
 });
+var _asset = require("./asset");
+Object.keys(_asset).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _asset[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _asset[key];
+    }
+  });
+});
 var _environment = require("./environment");
 Object.keys(_environment).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/koni/api/tokens/evm/balance.d.ts

@@ -1,2 +1,2 @@
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
-export declare function getEVMBalance(networkKey: string, addresses: string[], evmApiMap: Record<string, _EvmApi>): Promise<string[]>;
+export declare function getEVMBalance(networkKey: string, addresses: string[], web3Api: _EvmApi): Promise<string[]>;

package/koni/api/tokens/evm/balance.js

@@ -1,8 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-export async function getEVMBalance(networkKey, addresses, evmApiMap) {
-  const web3Api = evmApiMap[networkKey];
+export async function getEVMBalance(networkKey, addresses, web3Api) {
   return await Promise.all(addresses.map(async address => {
     try {
       return await web3Api.api.eth.getBalance(address);

package/koni/api/tokens/evm/transfer.d.ts

@@ -11,7 +11,7 @@ interface HandleTransferBalanceResultProps {
     updateState?: (promise: Partial<ExternalRequestPromise>) => void;
 }
 export declare const handleTransferBalanceResult: ({ callback, changeValue, networkKey, receipt, response, updateState }: HandleTransferBalanceResultProps) => void;
-export declare function getEVMTransactionObject(chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApiMap: Record<string, _EvmApi>): Promise<[TransactionConfig, string]>;
-export declare function getERC20TransactionObject(assetAddress: string, chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApiMap: Record<string, _EvmApi>): Promise<[TransactionConfig, string]>;
+export declare function getEVMTransactionObject(chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, web3Api: _EvmApi): Promise<[TransactionConfig, string]>;
+export declare function getERC20TransactionObject(assetAddress: string, chainInfo: _ChainInfo, from: string, to: string, value: string, transferAll: boolean, evmApi: _EvmApi): Promise<[TransactionConfig, string]>;
 export declare function getERC721Transaction(web3Api: _EvmApi, chain: string, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string): Promise<TransactionConfig>;
 export {};

package/koni/api/tokens/evm/transfer.js

@@ -34,10 +34,9 @@ export const handleTransferBalanceResult = ({
   });
   callback(response);
 };
-export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
+export async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, web3Api) {
   var _priority$maxFeePerGa, _priority$maxPriority;
   const networkKey = chainInfo.slug;
-  const web3Api = evmApiMap[networkKey];
   const priority = await calculateGasFeeParams(web3Api, networkKey);
   const transactionObject = {
     to: to,
@@ -63,11 +62,10 @@ export async function getEVMTransactionObject(chainInfo, from, to, value, transf
   }
   return [transactionObject, transactionObject.value.toString()];
 }
-export async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApiMap) {
+export async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApi) {
   var _priority$maxFeePerGa2, _priority$maxPriority2;
   const networkKey = chainInfo.slug;
-  const evmApi = evmApiMap[networkKey];
-  const erc20Contract = getERC20Contract(networkKey, assetAddress, evmApiMap);
+  const erc20Contract = getERC20Contract(assetAddress, evmApi);
   let freeAmount = new BigN(0);
   let transferValue = value;
   if (transferAll) {

package/koni/api/tokens/evm/web3.d.ts

@@ -1,3 +1,3 @@
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import { Contract } from 'web3-eth-contract';
-export declare const getERC20Contract: (networkKey: string, assetAddress: string, evmApiMap: Record<string, _EvmApi>, options?: {}) => Contract;
+export declare const getERC20Contract: (assetAddress: string, evmApi: _EvmApi, options?: {}) => Contract;

package/koni/api/tokens/evm/web3.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _ERC20_ABI } from '@subwallet/extension-base/services/chain-service/helper';
-export const getERC20Contract = (networkKey, assetAddress, evmApiMap, options = {}) => {
+export const getERC20Contract = (assetAddress, evmApi, options = {}) => {
   // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
-  return new evmApiMap[networkKey].api.eth.Contract(_ERC20_ABI, assetAddress, options);
+  return new evmApi.api.eth.Contract(_ERC20_ABI, assetAddress, options);
 };

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;
@@ -237,7 +226,7 @@ export default class KoniState {
     wakeup(): Promise<void>;
     cancelSubscription(id: string): boolean;
     createUnsubscriptionHandle(id: string, unsubscribe: () => void): void;
-    autoEnableChains(addresses: string[]): Promise<void>;
+    get detectBalanceChainSlugMap(): Record<string, string>;
     onAccountAdd(): void;
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;