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

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.BalanceService = void 0;
 var _BalanceError = require("@subwallet/extension-base/background/errors/BalanceError");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
-var _handlers = require("@subwallet/extension-base/koni/background/handlers");
+var _group = require("@subwallet/extension-base/services/balance-service/helpers/group");
+var _evm = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/evm");
+var _substrate = require("@subwallet/extension-base/services/balance-service/helpers/subscribe/substrate");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
@@ -15,10 +16,17 @@ var _i18next = require("i18next");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+/**
+ * Balance service
+ * @class
+*/
 class BalanceService {
-  constructor(chainService) {
-    this.chainService = chainService;
-
+  /**
+   * @constructor
+   * @param {KoniState} state - The state of extension.
+   */
+  constructor(state) {
+    this.state = state;
     // Todo: Load data from db to balanceSubject
     // Todo: Start  subscribe balance and data
     // Todo: Listen change and apply to balanceSubject
@@ -29,9 +37,10 @@ class BalanceService {
     // Todo: Move everything of fetching balance to this service
   }
 
+  /* Subscribe token free balance on chain */
   async subscribeTokenFreeBalance(address, chain, tokenSlug, callback) {
-    const chainInfo = this.chainService.getChainInfoByKey(chain);
-    const chainState = this.chainService.getChainStateByKey(chain);
+    const chainInfo = this.state.chainService.getChainInfoByKey(chain);
+    const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
       return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.NETWORK_ERROR, (0, _i18next.t)('{{chain}} is inactive. Please enable network', {
         replace: {
@@ -40,7 +49,7 @@ class BalanceService {
       })));
     }
     const tSlug = tokenSlug || (0, _utils._getChainNativeTokenSlug)(chainInfo);
-    const tokenInfo = this.chainService.getAssetBySlug(tSlug);
+    const tokenInfo = this.state.chainService.getAssetBySlug(tSlug);
     if (!tokenInfo) {
       return Promise.reject(new _BalanceError.BalanceError(_KoniTypes.BalanceErrorType.TOKEN_ERROR, (0, _i18next.t)('Transfer is currently not available for this token: {{tSlug}}', {
         replace: {
@@ -75,35 +84,51 @@ class BalanceService {
       }, 9999);
     });
   }
+
+  /**
+   * @public
+   * @async
+   * @function getTokenFreeBalance
+   * @desc Fetch free balance on chain
+   * @param {string} address - Address
+   * @param {string} chain - Slug of chain
+   * @param {string} [tokenSlug] - Slug of token
+   * @return {Promise<AmountData>} - Free token balance of address on chain
+  */
   async getTokenFreeBalance(address, chain, tokenSlug) {
     const [, balance] = await this.subscribeTokenFreeBalance(address, chain, tokenSlug);
     return balance;
   }
-  subscribeBalance(addresses, chains, callback) {
+  subscribeBalance(addresses, chains, _callback) {
     const [substrateAddresses, evmAddresses] = (0, _utils2.categoryAddresses)(addresses);
-    const chainInfoMap = this.chainService.getChainInfoMap();
-    const chainStateMap = this.chainService.getChainStateMap();
-    const substrateApiMap = this.chainService.getSubstrateApiMap();
-    const evmApiMap = this.chainService.getEvmApiMap();
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const chainStateMap = this.state.chainService.getChainStateMap();
+    const substrateApiMap = this.state.chainService.getSubstrateApiMap();
+    const evmApiMap = this.state.chainService.getEvmApiMap();
 
     // Get data from chain or all chains
     const chainList = chains || Object.keys(chainInfoMap);
     // Filter active chain only
     const useChainInfos = chainList.filter(c => chainStateMap[c] && chainStateMap[c].active).map(c => chainInfoMap[c]);
+    const callback = items => {
+      if (items.length) {
+        _callback((0, _group.groupBalance)(items, 'GROUPED', items[0].tokenSlug));
+      }
+    };
 
     // Looping over each chain
     const unsubList = useChainInfos.map(async chainInfo => {
       const chainSlug = chainInfo.slug;
       const useAddresses = (0, _utils._isChainEvmCompatible)(chainInfo) ? evmAddresses : substrateAddresses;
       if ((0, _utils._isPureEvmChain)(chainInfo)) {
-        const nativeTokenInfo = _handlers.state.getNativeTokenInfo(chainSlug);
-        return (0, _balance.subscribeEVMBalance)(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
+        const nativeTokenInfo = this.state.getNativeTokenInfo(chainSlug);
+        return (0, _evm.subscribeEVMBalance)(chainSlug, useAddresses, evmApiMap, callback, nativeTokenInfo);
       }
       if (!useAddresses || useAddresses.length === 0 || _constants._PURE_EVM_CHAINS.indexOf(chainSlug) > -1) {
         return undefined;
       }
       const networkAPI = await substrateApiMap[chainSlug].isReady;
-      return (0, _balance.subscribeSubstrateBalance)(useAddresses, chainInfo, chainSlug, networkAPI, evmApiMap, callback);
+      return (0, _substrate.subscribeSubstrateBalance)(useAddresses, chainInfo, chainSlug, networkAPI, evmApiMap, callback);
     });
     return () => {
       unsubList.forEach(subProm => {

package/cjs/services/history-service/helpers/subscan-extrinsic-parser-helper.js

@@ -20,6 +20,12 @@ function paramJsonParse(item) {
     return [];
   }
 }
+function autoAddPublicKeyPrefix(publicKey) {
+  if (!publicKey.startsWith('0x')) {
+    return `0x${publicKey}`;
+  }
+  return publicKey;
+}
 function balanceTransferParserFunction(item) {
   const params = paramJsonParse(item);
   params.forEach(p => {
@@ -27,7 +33,7 @@ function balanceTransferParserFunction(item) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const toPublicKey = p.value.id || p.value.Id;
       if (toPublicKey) {
-        item.to = (0, _utilCrypto.encodeAddress)(toPublicKey, 42);
+        item.to = (0, _utilCrypto.encodeAddress)(autoAddPublicKeyPrefix(toPublicKey), 42);
       }
     } else if (p.name === 'value') {
       if (item.amount) {

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

@@ -83,7 +83,7 @@ class HistoryService {
     const excludeExtrinsicParserKeys = ['balances.transfer_all'];
 
     // Note: fetchAllPossibleExtrinsicItems and fetchAllPossibleTransferItems-receive can run parallelly
-    // Hover, fetchAllPossibleTransferItems-sent must run after fetchAllPossibleExtrinsicItems,
+    // However, fetchAllPossibleTransferItems-sent must run after fetchAllPossibleExtrinsicItems,
     // to avoid "duplicate Extrinsic Hash between items" problem
 
     this.subscanService.fetchAllPossibleExtrinsicItems(chain, address, extrinsicItems => {
@@ -104,11 +104,12 @@ class HistoryService {
           excludeTransferExtrinsicHash.push(x.extrinsic_hash);
         }
       });
-      this.subscanService.fetchAllPossibleTransferItems(chain, address, 'sent', transferItems => {
+      this.subscanService.fetchAllPossibleTransferItems(chain, address, 'sent').then(rsMap => {
         const result = [];
-        transferItems.forEach(t => {
-          if (!excludeTransferExtrinsicHash.includes(t.hash)) {
-            result.push((0, _subscanHistory.parseSubscanTransferData)(address, t, chainInfo));
+        Object.keys(rsMap).forEach(hash => {
+          // only push item that does not have same hash with another item
+          if (!excludeTransferExtrinsicHash.includes(hash) && rsMap[hash].length === 1) {
+            result.push((0, _subscanHistory.parseSubscanTransferData)(address, rsMap[hash][0], chainInfo));
           }
         });
         this.addHistoryItems(result).catch(e => {
@@ -120,10 +121,13 @@ class HistoryService {
     }).catch(e => {
       console.log('fetchAllPossibleExtrinsicItems error', e);
     });
-    this.subscanService.fetchAllPossibleTransferItems(chain, address, 'received', transferItems => {
+    this.subscanService.fetchAllPossibleTransferItems(chain, address, 'received').then(rsMap => {
       const result = [];
-      transferItems.forEach(t => {
-        result.push((0, _subscanHistory.parseSubscanTransferData)(address, t, chainInfo));
+      Object.keys(rsMap).forEach(hash => {
+        // only push item that does not have same hash with another item
+        if (rsMap[hash].length === 1) {
+          result.push((0, _subscanHistory.parseSubscanTransferData)(address, rsMap[hash][0], chainInfo));
+        }
       });
       this.addHistoryItems(result).catch(e => {
         console.log('addHistoryItems in fetchAllPossibleTransferItems-receive error', e);

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

@@ -14,7 +14,7 @@ class MigrateProvider extends _Base.default {
     const state = this.state;
     const chainState = state.getChainStateByKey(this.slug);
     const chainInfo = state.getChainInfo(this.slug);
-    if (chainState.active && chainState.currentProvider === this.oldProvider) {
+    if (chainState && chainState.active && chainState.currentProvider === this.oldProvider) {
       await state.upsertChainInfo({
         mode: 'update',
         chainEditInfo: {

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

@@ -65,14 +65,19 @@ class DatabaseService {
   async getStoredBalance() {
     return this.stores.balance.table.toArray();
   }
-  async updateBalanceStore(address, item) {
+  async updateBalanceStore(item) {
     if (item.state === _KoniTypes.APIItemState.READY) {
       return this.stores.balance.upsert({
-        address,
         ...item
       });
     }
   }
+  async updateBulkBalanceStore(items) {
+    const filtered = items.filter(item => item.state !== _KoniTypes.APIItemState.PENDING);
+    if (filtered.length) {
+      return this.stores.balance.bulkUpsert(filtered);
+    }
+  }
   async removeFromBalanceStore(assets) {
     return this.stores.balance.removeBySlugs(assets);
   }

package/cjs/services/storage-service/db-stores/Balance.js

@@ -10,17 +10,17 @@ var _BaseStoreWithAddress = _interopRequireDefault(require("../db-stores/BaseSto
 // SPDX-License-Identifier: Apache-2.0
 
 class BalanceStore extends _BaseStoreWithAddress.default {
-  async getBalanceMapByAddress(address) {
-    const data = await this.table.where('address').equals(address).toArray();
+  async getBalanceMapByAddresses(addresses) {
+    const data = await this.table.where('address').anyOf(addresses).toArray();
     const balanceMap = {};
     data.forEach(storedBalance => {
-      balanceMap[storedBalance.tokenSlug] = {
-        tokenSlug: storedBalance.tokenSlug,
-        state: storedBalance.state,
-        free: storedBalance.free,
-        locked: storedBalance.locked,
-        substrateInfo: storedBalance.substrateInfo,
-        timestamp: storedBalance.timestamp
+      const address = storedBalance.address;
+      const slug = storedBalance.tokenSlug;
+      if (!balanceMap[address]) {
+        balanceMap[address] = {};
+      }
+      balanceMap[address][slug] = {
+        ...storedBalance
       };
     });
     return balanceMap;

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

@@ -129,11 +129,19 @@ class SubscanService {
   }
   getExtrinsicsList(chain, address) {
     let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    let blockRange = arguments.length > 3 ? arguments[3] : undefined;
+    const _blockRange = (() => {
+      if (!blockRange || !blockRange.to) {
+        return null;
+      }
+      return `${blockRange.from || 0}-${blockRange.to}`;
+    })();
     return this.addRequest(async () => {
       const rs = await this.postRequest(this.getApiUrl(chain, 'api/scan/extrinsics'), {
         page,
         row: QUERY_ROW,
-        address
+        address,
+        block_range: _blockRange
       });
       if (rs.status !== 200) {
         throw new _SWError.SWError('SubscanService.getExtrinsicsList', await rs.text());
@@ -143,22 +151,38 @@ class SubscanService {
     });
   }
   async fetchAllPossibleExtrinsicItems(chain, address, cbAfterEachRequest) {
-    let count = 0;
+    let limit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+      page: 10,
+      record: 1000
+    };
+    let maxCount = 0;
+    let currentCount = 0;
+    const blockRange = {
+      from: null,
+      to: null
+    };
     const resultMap = {};
     const _getExtrinsicItems = async page => {
-      const res = await this.getExtrinsicsList(chain, address, page);
+      const res = await this.getExtrinsicsList(chain, address, page, blockRange);
       if (!res || !res.count || !res.extrinsics || !res.extrinsics.length) {
         return;
       }
-      if (res.count > count) {
-        count = res.count;
+      if (res.count > maxCount) {
+        maxCount = res.count;
       }
       cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.extrinsics);
       res.extrinsics.forEach(item => {
         resultMap[item.extrinsic_hash] = item;
       });
-      if (Object.values(resultMap).length < count) {
+      currentCount += res.extrinsics.length;
+      if (page > limit.page || currentCount > limit.record) {
+        return;
+      }
+      if (currentCount < maxCount) {
         await (0, _utils.wait)(100);
+        if (page === 0) {
+          blockRange.to = res.extrinsics[0].block_num;
+        }
         await _getExtrinsicItems(++page);
       }
     };
@@ -168,16 +192,16 @@ class SubscanService {
   getTransfersList(chain, address) {
     let page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     let direction = arguments.length > 3 ? arguments[3] : undefined;
-    const requestBody = {
-      page,
-      row: QUERY_ROW,
-      address
-    };
-    if (direction) {
-      requestBody.direction = direction;
-    }
+    let blockRange = arguments.length > 4 ? arguments[4] : undefined;
     return this.addRequest(async () => {
-      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), requestBody);
+      const rs = await this.postRequest(this.getApiUrl(chain, 'api/v2/scan/transfers'), {
+        page,
+        row: QUERY_ROW,
+        address,
+        direction: direction || null,
+        from_block: (blockRange === null || blockRange === void 0 ? void 0 : blockRange.from) || null,
+        to_block: (blockRange === null || blockRange === void 0 ? void 0 : blockRange.to) || null
+      });
       if (rs.status !== 200) {
         throw new _SWError.SWError('SubscanService.getTransfersList', await rs.text());
       }
@@ -186,27 +210,47 @@ class SubscanService {
     });
   }
   async fetchAllPossibleTransferItems(chain, address, direction, cbAfterEachRequest) {
-    let count = 0;
+    let limit = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {
+      page: 10,
+      record: 1000
+    };
+    let maxCount = 0;
+    let currentCount = 0;
+    const blockRange = {
+      from: null,
+      to: null
+    };
     const resultMap = {};
     const _getTransferItems = async page => {
-      const res = await this.getTransfersList(chain, address, page, direction);
+      const res = await this.getTransfersList(chain, address, page, direction, blockRange);
       if (!res || !res.count || !res.transfers || !res.transfers.length) {
         return;
       }
-      if (res.count > count) {
-        count = res.count;
+      if (res.count > maxCount) {
+        maxCount = res.count;
       }
       cbAfterEachRequest === null || cbAfterEachRequest === void 0 ? void 0 : cbAfterEachRequest(res.transfers);
       res.transfers.forEach(item => {
-        resultMap[item.hash] = item;
+        if (!resultMap[item.hash]) {
+          resultMap[item.hash] = [item];
+        } else {
+          resultMap[item.hash].push(item);
+        }
       });
-      if (Object.values(resultMap).length < count) {
+      currentCount += res.transfers.length;
+      if (page > limit.page || currentCount > limit.record) {
+        return;
+      }
+      if (currentCount < maxCount) {
         await (0, _utils.wait)(100);
+        if (page === 0) {
+          blockRange.to = res.transfers[0].block_num;
+        }
         await _getTransferItems(++page);
       }
     };
     await _getTransferItems(0);
-    return Object.values(resultMap);
+    return resultMap;
   }
 }
 exports.SubscanService = SubscanService;

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

@@ -121,7 +121,8 @@ class TransactionService {
             if (!web3) {
               validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.CHAIN_DISCONNECTED, undefined));
             } else {
-              const gasPrice = await web3.api.eth.getGasPrice();
+              const _price = await web3.api.eth.getGasPrice();
+              const gasPrice = (0, _eth.recalculateGasPrice)(_price, chainInfo.slug);
               const gasLimit = await web3.api.eth.estimateGas(transaction);
               estimateFee.value = (gasLimit * parseInt(gasPrice)).toString();
             }
@@ -932,8 +933,8 @@ class TransactionService {
           }).forEach(_ref11 => {
             let {
               event: {
-                method,
-                data: [error]
+                data: [error],
+                method
               }
             } = _ref11;
             if (method === 'ExtrinsicFailed') {

package/cjs/types/balance.js

@@ -0,0 +1 @@
+"use strict";

package/cjs/types/index.js

@@ -3,6 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _balance = require("./balance");
+Object.keys(_balance).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _balance[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _balance[key];
+    }
+  });
+});
 var _buy = require("./buy");
 Object.keys(_buy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/utils/{address.js → account.js}

@@ -1,12 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertSubjectInfoToAddresses = void 0;
+exports.getAccountJsonByAddress = exports.convertSubjectInfoToAddresses = void 0;
 exports.quickFormatAddressToCompare = quickFormatAddressToCompare;
 exports.simpleAddress = void 0;
 var _index = require("@subwallet/extension-base/utils/index");
+var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -31,4 +33,32 @@ const convertSubjectInfoToAddresses = subjectInfo => {
     ...info.json.meta
   }));
 };
-exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;
+
+/**
+ * @function getAccountJsonByAddress
+ * @desc Get account info by address
+ * <p>
+ *   Note: Use on the background only
+ * </p>
+ * @param {string} address - Address
+ * @returns {AccountJson|null}  - Account info or null if not found
+ */
+exports.convertSubjectInfoToAddresses = convertSubjectInfoToAddresses;
+const getAccountJsonByAddress = address => {
+  try {
+    const pair = _uiKeyring.default.getPair(address);
+    if (pair) {
+      return {
+        address: pair.address,
+        type: pair.type,
+        ...pair.meta
+      };
+    } else {
+      return null;
+    }
+  } catch (e) {
+    console.warn(e);
+    return null;
+  }
+};
+exports.getAccountJsonByAddress = getAccountJsonByAddress;

package/cjs/utils/eth.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.signatureToHex = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+exports.signatureToHex = exports.recalculateGasPrice = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+var _constants = require("@subwallet/extension-base/constants");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethers = require("ethers");
 var _util = require("@polkadot/util");
@@ -69,4 +70,8 @@ const signatureToHex = sig => {
   const hexV = (0, _util.hexStripPrefix)((0, _util.numberToHex)(v));
   return hexR + hexS + hexV;
 };
-exports.signatureToHex = signatureToHex;
+exports.signatureToHex = signatureToHex;
+const recalculateGasPrice = (_price, chain) => {
+  return _constants.NETWORK_MULTI_GAS_FEE.includes(chain) ? new _bignumber.default(_price).multipliedBy(_constants.GAS_PRICE_RATIO).toFixed(0) : _price;
+};
+exports.recalculateGasPrice = recalculateGasPrice;

package/cjs/utils/index.js

@@ -78,6 +78,18 @@ var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _canDerive = require("./canDerive");
+var _account = require("./account");
+Object.keys(_account).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _account[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _account[key];
+    }
+  });
+});
 var _array = require("./array");
 Object.keys(_array).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/constants/index.d.ts

@@ -20,5 +20,7 @@ export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
+export declare const GAS_PRICE_RATIO = 1.05;
+export declare const NETWORK_MULTI_GAS_FEE: string[];
 export * from './staking';
 export * from './storage';

package/constants/index.js

@@ -23,5 +23,7 @@ export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
+export const GAS_PRICE_RATIO = 1.05;
+export const NETWORK_MULTI_GAS_FEE = ['astarEvm'];
 export * from "./staking.js";
 export * from "./storage.js";

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

@@ -104,6 +104,7 @@ export async function getCancelWithdrawalExtrinsic(substrateApi, chain, selected
 export 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/koni/api/tokens/evm/balance.js

@@ -4,6 +4,10 @@
 export 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/koni/api/tokens/evm/transfer.d.ts

@@ -13,5 +13,5 @@ interface HandleTransferBalanceResultProps {
 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 getERC721Transaction(web3Api: _EvmApi, contractAddress: string, senderAddress: string, recipientAddress: string, tokenId: string): Promise<TransactionConfig>;
+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

@@ -5,6 +5,7 @@ import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/backgrou
 import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/web3';
 import { _BALANCE_PARSING_CHAIN_GROUP, EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ERC721_ABI } from '@subwallet/extension-base/services/chain-service/helper';
+import { recalculateGasPrice } from '@subwallet/extension-base/utils/eth';
 import { BN, hexToBn } from '@polkadot/util';
 export const handleTransferBalanceResult = ({
   callback,
@@ -35,7 +36,8 @@ export const handleTransferBalanceResult = ({
 export 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 = recalculateGasPrice(_price, chainInfo.slug);
   const transactionObject = {
     gasPrice: gasPrice,
     to: to,
@@ -69,11 +71,12 @@ export async function getERC20TransactionObject(assetAddress, chainInfo, from, t
     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 = recalculateGasPrice(_price, chainInfo.slug);
   const transactionObject = {
     gasPrice: gasPrice,
     gas: gasLimit,
@@ -87,14 +90,15 @@ export async function getERC20TransactionObject(assetAddress, chainInfo, from, t
   }
   return [transactionObject, transferValue];
 }
-export async function getERC721Transaction(web3Api, contractAddress, senderAddress, recipientAddress, tokenId) {
+export 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(_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 = recalculateGasPrice(_price, chain);
   return {
     from: senderAddress,
     gasPrice,

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -104,8 +104,8 @@ export 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()), CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-      this.addCron('refreshPoolingSta             kingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), 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), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();