@subwallet/extension-base 1.1.24-0 → 1.1.24-1

package/background/KoniTypes.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _FundStatus, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
@@ -7,7 +6,7 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { BuyServiceInfo, BuyTokenInfo } from '@subwallet/extension-base/types';
+import { BalanceJson, BuyServiceInfo, BuyTokenInfo } from '@subwallet/extension-base/types';
 import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
@@ -18,7 +17,6 @@ import Web3 from 'web3';
 import { RequestArguments, TransactionConfig } from 'web3-core';
 import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
 import { SignerResult } from '@polkadot/types/types/extrinsic';
-import { BN } from '@polkadot/util';
 import { HexString } from '@polkadot/util/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 import { TransactionWarning } from './warnings/TransactionWarning';
@@ -196,28 +194,6 @@ export interface MetadataItem {
     specVersion: string;
     hexValue: HexString;
 }
-export interface TokenBalanceRaw {
-    reserved: BN;
-    frozen: BN;
-    free: BN;
-}
-export interface SubstrateBalance {
-    reserved?: string;
-    miscFrozen?: string;
-    feeFrozen?: string;
-}
-export interface BalanceItem {
-    tokenSlug: string;
-    state: APIItemState;
-    timestamp?: number;
-    free: string;
-    locked: string;
-    substrateInfo?: SubstrateBalance;
-}
-export interface BalanceJson {
-    reset?: boolean;
-    details: Record<string, BalanceItem>;
-}
 export interface CrowdloanItem {
     state: APIItemState;
     paraState?: CrowdloanParaState;

package/cjs/constants/index.js

@@ -25,9 +25,11 @@ var _exportNames = {
   ALL_GENESIS_HASH: true,
   IGNORE_GET_SUBSTRATE_FEATURES_LIST: true,
   IGNORE_QR_SIGNER: true,
-  XCM_MIN_AMOUNT_RATIO: true
+  XCM_MIN_AMOUNT_RATIO: true,
+  GAS_PRICE_RATIO: true,
+  NETWORK_MULTI_GAS_FEE: true
 };
-exports.XCM_MIN_AMOUNT_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.XCM_MIN_AMOUNT_RATIO = exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.NETWORK_MULTI_GAS_FEE = exports.MANTA_PAY_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.GAS_PRICE_RATIO = exports.CRON_SYNC_MANTA_PAY = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -98,4 +100,8 @@ exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = IGNORE_GET_SUBSTRATE_FEATURES_LIST;
 const IGNORE_QR_SIGNER = [];
 exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
 const XCM_MIN_AMOUNT_RATIO = 1.2;
-exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
+exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
+const GAS_PRICE_RATIO = 1.05;
+exports.GAS_PRICE_RATIO = GAS_PRICE_RATIO;
+const NETWORK_MULTI_GAS_FEE = ['astarEvm'];
+exports.NETWORK_MULTI_GAS_FEE = NETWORK_MULTI_GAS_FEE;

package/cjs/koni/api/staking/bonding/index.js

@@ -122,6 +122,7 @@ async function getCancelWithdrawalExtrinsic(substrateApi, chain, selectedUnstaki
 function subscribeEssentialChainStakingMetadata(substrateApiMap, chainInfoMap, callback) {
   const unsubList = [];
 
+  // TODO: replace with for of to improve performance
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   Object.values(chainInfoMap).forEach(async chainInfo => {
     if (!substrateApiMap[chainInfo.slug]) {

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

@@ -10,6 +10,10 @@ exports.getEVMBalance = getEVMBalance;
 async function getEVMBalance(networkKey, addresses, evmApiMap) {
   const web3Api = evmApiMap[networkKey];
   return await Promise.all(addresses.map(async address => {
-    return await web3Api.api.eth.getBalance(address);
+    try {
+      return await web3Api.api.eth.getBalance(address);
+    } catch (e) {
+      return '0';
+    }
   }));
 }

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

@@ -11,6 +11,7 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _web = require("@subwallet/extension-base/koni/api/tokens/evm/web3");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _helper = require("@subwallet/extension-base/services/chain-service/helper");
+var _eth = require("@subwallet/extension-base/utils/eth");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -46,7 +47,8 @@ exports.handleTransferBalanceResult = handleTransferBalanceResult;
 async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
   const networkKey = chainInfo.slug;
   const web3Api = evmApiMap[networkKey];
-  const gasPrice = await web3Api.api.eth.getGasPrice();
+  const _price = await web3Api.api.eth.getGasPrice();
+  const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
   const transactionObject = {
     gasPrice: gasPrice,
     to: to,
@@ -80,11 +82,12 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
     return erc20Contract.methods.transfer(to, transferValue).encodeABI();
   }
   const transferData = generateTransferData(to, transferValue);
-  const [gasLimit, gasPrice] = await Promise.all([
+  const [gasLimit, _price] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
   }), evmApi.api.eth.getGasPrice()]);
+  const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
   const transactionObject = {
     gasPrice: gasPrice,
     gas: gasLimit,
@@ -98,14 +101,15 @@ async function getERC20TransactionObject(assetAddress, chainInfo, from, to, valu
   }
   return [transactionObject, transferValue];
 }
-async function getERC721Transaction(web3Api, contractAddress, senderAddress, recipientAddress, tokenId) {
+async function getERC721Transaction(web3Api, chain, contractAddress, senderAddress, recipientAddress, tokenId) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const contract = new web3Api.api.eth.Contract(_helper._ERC721_ABI, contractAddress);
-  const [gasLimit, gasPrice] = await Promise.all([
+  const [gasLimit, _price] = await Promise.all([
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   contract.methods.safeTransferFrom(senderAddress, recipientAddress, tokenId).estimateGas({
     from: senderAddress
   }), web3Api.api.eth.getGasPrice()]);
+  const gasPrice = (0, _eth.recalculateGasPrice)(_price, chain);
   return {
     from: senderAddress,
     gasPrice,

package/cjs/koni/background/cron.js

@@ -115,8 +115,8 @@ class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
-      this.addCron('refreshPoolingSta             kingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+      // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
+      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();

package/cjs/koni/background/handlers/Extension.js

@@ -33,7 +33,6 @@ var _constants4 = require("@subwallet/extension-base/services/setting-service/co
 var _constants5 = require("@subwallet/extension-base/services/wallet-connect-service/constants");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _utils2 = require("@subwallet/extension-base/utils");
-var _address2 = require("@subwallet/extension-base/utils/address");
 var _eth = require("@subwallet/extension-base/utils/eth");
 var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _number = require("@subwallet/extension-base/utils/number");
@@ -546,7 +545,7 @@ class KoniExtension {
   subscribeAddresses(id, port) {
     const _cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.keyringService.addressesSubject.subscribe(subjectInfo => {
-      const addresses = (0, _address2.convertSubjectInfoToAddresses)(subjectInfo);
+      const addresses = (0, _utils2.convertSubjectInfoToAddresses)(subjectInfo);
       _cb({
         addresses: addresses
       });
@@ -557,7 +556,7 @@ class KoniExtension {
     });
     const subjectInfo = this.#koniState.keyringService.addresses;
     return {
-      addresses: (0, _address2.convertSubjectInfoToAddresses)(subjectInfo)
+      addresses: (0, _utils2.convertSubjectInfoToAddresses)(subjectInfo)
     };
   }
   saveRecentAccount(_ref22) {
@@ -1779,7 +1778,7 @@ class KoniExtension {
     } = inputData;
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
-    const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
+    const transaction = await (0, _transfer3.getERC721Transaction)(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
 
     // this.addContact(recipientAddress);
 
@@ -1930,7 +1929,8 @@ class KoniExtension {
               // null address
               from: address
             };
-            const gasPrice = await web3.api.eth.getGasPrice();
+            const _price = await web3.api.eth.getGasPrice();
+            const gasPrice = (0, _eth.recalculateGasPrice)(_price, networkKey);
             const gasLimit = await web3.api.eth.estimateGas(transaction);
             estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
           } else {

package/cjs/koni/background/handlers/Mobile.js

@@ -119,7 +119,7 @@ class Mobile {
     if (storage) {
       const storageData = JSON.parse(storage);
       for (const key in storageData) {
-        localStorage.setItem(key, JSON.stringify(storageData[key]));
+        localStorage.setItem(key, storageData[key]);
       }
     }
     if (indexedDB) {

package/cjs/koni/background/handlers/State.js

@@ -11,6 +11,7 @@ var _subscriptions = require("@subwallet/extension-base/background/handlers/subs
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/constants");
 var _balanceService = require("@subwallet/extension-base/services/balance-service");
+var _group = require("@subwallet/extension-base/services/balance-service/helpers/group");
 var _types = require("@subwallet/extension-base/services/base/types");
 var _buyService = _interopRequireDefault(require("@subwallet/extension-base/services/buy-service"));
 var _campaignService = _interopRequireDefault(require("@subwallet/extension-base/services/campaign-service"));
@@ -32,6 +33,7 @@ var _transactionService = _interopRequireDefault(require("@subwallet/extension-b
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
 var _utils2 = require("@subwallet/extension-base/utils");
+var _eth = require("@subwallet/extension-base/utils/eth");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _decode = require("@subwallet/keyring/pair/decode");
@@ -97,7 +99,7 @@ class KoniState {
     this.settingService = new _SettingService.default();
     this.requestService = new _requestService.default(this.chainService, this.settingService, this.keyringService);
     this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
-    this.balanceService = new _balanceService.BalanceService(this.chainService);
+    this.balanceService = new _balanceService.BalanceService(this);
     this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService, this.subscanService);
     this.transactionService = new _transactionService.default(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
     this.walletConnectService = new _walletConnectService.default(this, this.requestService);
@@ -195,16 +197,23 @@ class KoniState {
   generateDefaultBalanceMap() {
     const balanceMap = {};
     const activeChains = this.chainService.getActiveChainInfoMap();
-    Object.values(activeChains).forEach(chainInfo => {
-      const chainAssetMap = this.chainService.getFungibleTokensByChain(chainInfo.slug);
-      Object.keys(chainAssetMap).forEach(assetSlug => {
-        balanceMap[assetSlug] = {
-          tokenSlug: assetSlug,
-          free: '',
-          locked: '',
-          state: _KoniTypes.APIItemState.PENDING
-        };
+    const isAllAccount = (0, _utils2.isAccountAll)(this.keyringService.currentAccount.address);
+    const addresses = isAllAccount ? Object.keys(this.keyringService.accounts) : [this.keyringService.currentAccount.address];
+    addresses.forEach(address => {
+      const temp = {};
+      Object.values(activeChains).forEach(chainInfo => {
+        const chainAssetMap = this.chainService.getFungibleTokensByChain(chainInfo.slug);
+        Object.keys(chainAssetMap).forEach(assetSlug => {
+          temp[assetSlug] = {
+            address,
+            tokenSlug: assetSlug,
+            free: '',
+            locked: '',
+            state: _KoniTypes.APIItemState.PENDING
+          };
+        });
       });
+      balanceMap[address] = temp;
     });
     return balanceMap;
   }
@@ -681,14 +690,18 @@ class KoniState {
   removeInactiveChainBalances(balanceMap) {
     const activeBalanceMap = {};
     Object.entries(balanceMap).forEach(_ref5 => {
-      let [tokenSlug, balanceItem] = _ref5;
-      const tokenInfo = this.chainService.getAssetBySlug(tokenSlug);
-      if (tokenInfo) {
-        const chainInfo = this.chainService.getChainInfoByKey(tokenInfo.originChain);
-        if (chainInfo && this.getChainStateByKey(chainInfo.slug).active) {
-          activeBalanceMap[tokenSlug] = balanceItem;
+      let [address, balances] = _ref5;
+      activeBalanceMap[address] = {};
+      Object.entries(balances).forEach(_ref6 => {
+        let [tokenSlug, item] = _ref6;
+        const tokenInfo = this.chainService.getAssetBySlug(tokenSlug);
+        if (tokenInfo) {
+          const chainInfo = this.chainService.getChainInfoByKey(tokenInfo.originChain);
+          if (chainInfo && this.getChainStateByKey(chainInfo.slug).active) {
+            activeBalanceMap[address][tokenSlug] = item;
+          }
         }
-      }
+      });
     });
     return activeBalanceMap;
   }
@@ -700,7 +713,7 @@ class KoniState {
     };
   }
   async getStoredBalance(address) {
-    const items = await this.dbService.stores.balance.getBalanceMapByAddress(address);
+    const items = await this.dbService.stores.balance.getBalanceMapByAddresses(address);
     return items || {};
   }
   async handleSwitchAccount(newAddress) {
@@ -710,6 +723,31 @@ class KoniState {
     const defaultData = this.generateDefaultBalanceMap();
     let storedData = await this.getStoredBalance(newAddress);
     storedData = this.removeInactiveChainBalances(storedData);
+    const result = {};
+    for (const [address, balanceInfo] of Object.entries(defaultData)) {
+      result[address] = {
+        ...balanceInfo
+      };
+    }
+    for (const [address, balanceInfo] of Object.entries(storedData)) {
+      if (!result[address]) {
+        result[address] = {
+          ...balanceInfo
+        };
+      } else {
+        const temp = {
+          ...result[address]
+        };
+        for (const [slug, item] of Object.entries(balanceInfo)) {
+          temp[slug] = {
+            ...item
+          };
+        }
+        result[address] = {
+          ...temp
+        };
+      }
+    }
     this.balanceMap = {
       ...defaultData,
       ...storedData
@@ -737,19 +775,59 @@ class KoniState {
       });
     });
   }
-  setBalanceItem(tokenSlug, item) {
-    this.balanceMap[tokenSlug] = {
-      timestamp: +new Date(),
-      ...item
-    };
-    this.updateBalanceStore(item);
-    this.lazyNext('setBalanceItem', () => {
-      this.publishBalance();
-    });
+
+  /** Note: items must be same tokenSlug */
+  setBalanceItem(items) {
+    if (items.length) {
+      const tokens = [];
+      const updates = [];
+      for (const item of items) {
+        const address = item.address;
+        const tokenSlug = item.tokenSlug;
+        if (!tokens.includes(tokenSlug)) {
+          tokens.push(tokenSlug);
+        }
+        if (!this.balanceMap[address]) {
+          this.balanceMap[address] = {};
+        }
+        const data = {
+          timestamp: +new Date(),
+          ...item
+        };
+        this.balanceMap[address][tokenSlug] = data;
+        updates.push(data);
+      }
+      const isAllAccount = (0, _utils2.isAccountAll)(this.keyringService.currentAccount.address);
+      if (isAllAccount) {
+        const address = _constants.ALL_ACCOUNT_KEY;
+        for (const token of tokens) {
+          const items = [];
+          for (const [_adr, balanceInfo] of Object.entries(this.balanceMap)) {
+            if (!(0, _utils2.isSameAddress)(_adr, address)) {
+              const item = balanceInfo[token];
+              item && items.push(item);
+            }
+          }
+          const _balance = (0, _group.groupBalance)(items, address, token);
+          const balance = {
+            timestamp: +new Date(),
+            ..._balance
+          };
+          if (!this.balanceMap[address]) {
+            this.balanceMap[address] = {};
+          }
+          this.balanceMap[address][token] = balance;
+          updates.push(balance);
+        }
+      }
+      this.updateBalanceStore(updates);
+      this.lazyNext('setBalanceItem', () => {
+        this.publishBalance();
+      });
+    }
   }
-  updateBalanceStore(item) {
-    const currentAccountInfo = this.keyringService.currentAccount;
-    this.dbService.updateBalanceStore(currentAccountInfo.address, item).catch(e => this.logger.warn(e));
+  updateBalanceStore(items) {
+    this.dbService.updateBulkBalanceStore(items).catch(e => this.logger.warn(e));
   }
   subscribeBalance() {
     return this.balanceSubject;
@@ -1030,8 +1108,8 @@ class KoniState {
     if (!genesisHash) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref6 => {
-      let [networkKey, chainInfo] = _ref6;
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref7 => {
+      let [networkKey, chainInfo] = _ref7;
       return (0, _utils._getSubstrateGenesisHash)(chainInfo) === genesisHash;
     });
     if (rs) {
@@ -1048,9 +1126,9 @@ class KoniState {
     if (!chainId) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref7 => {
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(_ref8 => {
       var _chainInfo$evmInfo;
-      let [networkKey, chainInfo] = _ref7;
+      let [networkKey, chainInfo] = _ref8;
       return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
     });
     if (rs) {
@@ -1066,11 +1144,11 @@ class KoniState {
     }
     return Object.values(_constants2._PREDEFINED_SINGLE_MODES).find(item => item.networkKeys.includes(networkKey));
   }
-  accountExportPrivateKey(_ref8) {
+  accountExportPrivateKey(_ref9) {
     let {
       address,
       password
-    } = _ref8;
+    } = _ref9;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const exportedJson = _uiKeyring.keyring.backupAccount(_uiKeyring.keyring.getPair(address), password);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -1080,11 +1158,11 @@ class KoniState {
       publicKey: (0, _util.u8aToHex)(decoded.publicKey)
     };
   }
-  checkPublicAndSecretKey(_ref9) {
+  checkPublicAndSecretKey(_ref10) {
     let {
       publicKey,
       secretKey
-    } = _ref9;
+    } = _ref10;
     try {
       const _secret = (0, _util.hexStripPrefix)(secretKey);
       if (_secret.length === 64) {
@@ -1202,11 +1280,11 @@ class KoniState {
     return this.requestService.addConfirmation(id, url, 'evmSignatureRequest', signPayload, {
       requiredPassword: false,
       address
-    }).then(_ref10 => {
+    }).then(_ref11 => {
       let {
         isApproved,
         payload
-      } = _ref10;
+      } = _ref11;
       if (isApproved) {
         if (payload) {
           return payload;
@@ -1253,7 +1331,8 @@ class KoniState {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
-    const gasPrice = await web3.eth.getGasPrice();
+    const _price = await web3.eth.getGasPrice();
+    const gasPrice = (0, _eth.recalculateGasPrice)(_price, networkKey);
     transaction.gasPrice = gasPrice;
     const estimateGas = new _util.BN(gasPrice.toString()).mul(new _util.BN(transaction.gas)).toString();
 
@@ -1490,7 +1569,7 @@ class KoniState {
     const chainMap = this.chainService.getChainInfoMap();
     const balanceDataList = await Promise.all(promiseList);
     balanceDataList.forEach(balanceData => {
-      balanceData && balanceData.forEach(_ref11 => {
+      balanceData && balanceData.forEach(_ref12 => {
         var _currentAssetSettings;
         let {
           balance,
@@ -1499,7 +1578,7 @@ class KoniState {
           locked,
           network,
           symbol
-        } = _ref11;
+        } = _ref12;
         const chain = _subscanChainMap.SUBSCAN_BALANCE_CHAIN_MAP_REVERSE[network];
         const chainInfo = chain ? chainMap[chain] : null;
         const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
@@ -1688,7 +1767,7 @@ class KoniState {
         };
         balanceItem.free = ((_zkBalances$i = zkBalances[i]) === null || _zkBalances$i === void 0 ? void 0 : _zkBalances$i.toString()) || '0';
         balanceItem.state = _KoniTypes.APIItemState.READY;
-        this.setBalanceItem(balanceItem.tokenSlug, balanceItem);
+        this.setBalanceItem([balanceItem]);
       }
     }).catch(console.warn);
   }

package/cjs/koni/background/subscription.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KoniSubscription = void 0;
-var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _staking = require("@subwallet/extension-base/koni/api/staking");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
+var _balance = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/balance");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/services/event-service/types");
 var _utils2 = require("@subwallet/extension-base/utils");
@@ -153,7 +153,7 @@ class KoniSubscription {
       }
     });
     const unsub = (0, _balance.subscribeBalance)(addresses, filteredChainInfoMap, substrateApiMap, evmApiMap, result => {
-      this.state.setBalanceItem(result.tokenSlug, result);
+      this.state.setBalanceItem(result);
     });
     const unsub2 = this.state.subscribeMantaPayBalance();
     if (onlyRunOnFirstTime) {

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.24-0'
+  version: '1.1.24-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/group.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupBalance = void 0;
+var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _utils = require("@subwallet/extension-base/utils");
+var _bn = _interopRequireDefault(require("bn.js"));
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Group the balance of {token} from {items} into {address}
+ * @param {BalanceItem[]} items - List balance want to group
+ * @param {string} address - Address will be grouped to
+ * @param {string} token - Slug of token will be group balance
+ * @return {BalanceItem} - Grouped balance information of token
+ */
+const groupBalance = (items, address, token) => {
+  const states = items.map(item => item.state);
+  const result = {
+    address,
+    tokenSlug: token,
+    free: (0, _utils.sumBN)(items.map(item => new _bn.default(item.free))).toString(),
+    locked: (0, _utils.sumBN)(items.map(item => new _bn.default(item.locked))).toString(),
+    state: states.every(item => item === _KoniTypes.APIItemState.NOT_SUPPORT) ? _KoniTypes.APIItemState.NOT_SUPPORT : states.some(item => item === _KoniTypes.APIItemState.READY) ? _KoniTypes.APIItemState.READY : _KoniTypes.APIItemState.PENDING
+  };
+  for (const item of items) {
+    if (item.substrateInfo) {
+      if (!result.substrateInfo) {
+        result.substrateInfo = {
+          ...item.substrateInfo
+        };
+      } else {
+        const old = {
+          ...result.substrateInfo
+        };
+        const _new = {
+          ...item.substrateInfo
+        };
+        result.substrateInfo = {
+          reserved: new _bn.default(old.reserved || '0').add(new _bn.default(_new.reserved || '0')).toString(),
+          feeFrozen: new _bn.default(old.feeFrozen || '0').add(new _bn.default(_new.feeFrozen || '0')).toString(),
+          miscFrozen: new _bn.default(old.miscFrozen || '0').add(new _bn.default(_new.miscFrozen || '0')).toString()
+        };
+      }
+    }
+  }
+  return result;
+};
+exports.groupBalance = groupBalance;