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

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

@@ -7,8 +7,9 @@ import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculat
 import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { t } from 'i18next';
-import { BN, BN_ZERO } from '@polkadot/util';
+import { BN, BN_ZERO, hexToString, isHex } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export function validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata) {
   const errors = [];
@@ -34,7 +35,7 @@ export function validatePoolBondingCondition(chainInfo, amount, selectedPool, ad
   let bnTotalStake = new BN(amount);
   const bnMinStake = new BN(chainStakingMetadata.minJoinNominationPool || '0');
   const minStakeErrorMessage = getMinStakeErrorMessage(chainInfo, bnMinStake);
-  const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainInfo.slug, true);
+  const existUnstakeErrorMessage = getExistUnstakeErrorMessage(chainInfo.slug, nominatorMetadata === null || nominatorMetadata === void 0 ? void 0 : nominatorMetadata.type, true);
   if (selectedPool.state !== 'Open') {
     errors.push(new TransactionError(StakingTxErrorType.INACTIVE_NOMINATION_POOL));
   }
@@ -190,13 +191,13 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      var _chainApi$api$query$i;
       let nominationStatus = StakingStatus.NOT_EARNING;
-      const [_identityInfo, _eraStaker] = await Promise.all([(_chainApi$api$query$i = chainApi.api.query.identity) === null || _chainApi$api$query$i === void 0 ? void 0 : _chainApi$api$query$i.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const [[identity], _eraStaker] = await Promise.all([parseIdentity(chainApi, validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
-      const identityInfo = _identityInfo === null || _identityInfo === void 0 ? void 0 : _identityInfo.toHuman();
-      const identity = parseIdentity(identityInfo);
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new BigN(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       });
       if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
@@ -254,6 +255,10 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
     isBondedBefore: bonded !== null
   };
 }
+
+/**
+ * Deprecated
+ * */
 export async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi) {
   var _chainApi$api$query10, _chainApi$api$query11, _chainApi$api$query12, _chainApi$api$query13, _chainApi$api$query14, _chainApi$api$query15, _chainApi$api$query16, _chainApi$api$query17, _chainApi$api$query18, _chainApi$api$query19, _chainApi$api$query20, _chainApi$api$query21, _chainApi$api$query22, _chainApi$api$query23;
   if (isEthereumAddress(address)) {
@@ -291,11 +296,12 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
       let nominationStatus = StakingStatus.NOT_EARNING;
-      const [_identityInfo, _eraStaker] = await Promise.all([chainApi.api.query.identity.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const [[identity], _eraStaker] = await Promise.all([parseIdentity(chainApi, validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
-      const identityInfo = _identityInfo.toHuman();
-      const identity = parseIdentity(identityInfo);
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new BigN(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       });
       if (!topNominators.includes(reformatAddress(address, _getChainSubstrateAddressPrefix(chainInfo)))) {
@@ -369,7 +375,10 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
     await Promise.all(validatorList.map(async validatorAddress => {
       const _eraStaker = await substrateApi.api.query.staking.erasStakers(currentEra, validatorAddress);
       const eraStaker = _eraStaker.toPrimitive();
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new BigN(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       }).slice(0, maxNominatorRewardedPerValidator);
       if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
@@ -446,7 +455,10 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
     await Promise.all(validatorList.map(async validatorAddress => {
       const _eraStaker = await chainApi.api.query.staking.erasStakers(currentEra, validatorAddress);
       const eraStaker = _eraStaker.toPrimitive();
-      const topNominators = eraStaker.others.map(nominator => {
+      const sortedNominators = eraStaker.others.sort((a, b) => {
+        return new BigN(b.value).minus(a.value).toNumber();
+      });
+      const topNominators = sortedNominators.map(nominator => {
         return nominator.who;
       }).slice(0, maxNominatorRewardedPerValidator);
       if (topNominators.includes(reformatAddress(poolStashAccount, _getChainSubstrateAddressPrefix(chainInfo)))) {
@@ -542,20 +554,14 @@ export async function getRelayValidatorsInfo(chain, substrateApi, decimals, chai
   }
   const extraInfoMap = {};
   await Promise.all(allValidators.map(async address => {
-    var _chainApi$api$query24, _chainApi$api$query25, _identityInfo$judgeme;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const [_commissionInfo, _identityInfo] = await Promise.all([chainApi.api.query.staking.validators(address), (_chainApi$api$query24 = chainApi.api.query) === null || _chainApi$api$query24 === void 0 ? void 0 : (_chainApi$api$query25 = _chainApi$api$query24.identity) === null || _chainApi$api$query25 === void 0 ? void 0 : _chainApi$api$query25.identityOf(address)]);
+    const [_commissionInfo, [identity, isVerified]] = await Promise.all([chainApi.api.query.staking.validators(address), parseIdentity(chainApi, address)]);
     const commissionInfo = _commissionInfo.toHuman();
-    const identityInfo = _identityInfo ? _identityInfo.toHuman() : null;
-    let identity;
-    if (identityInfo !== null) {
-      identity = parseIdentity(identityInfo);
-    }
     extraInfoMap[address] = {
       commission: commissionInfo.commission,
       blocked: commissionInfo.blocked,
       identity,
-      isVerified: identityInfo && (identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$judgeme = identityInfo.judgements) === null || _identityInfo$judgeme === void 0 ? void 0 : _identityInfo$judgeme.length) > 0
+      isVerified: isVerified
     };
   }));
   const bnAvgStake = bnTotalEraStake.divn(validatorInfoList.length).div(bnDecimals);
@@ -587,10 +593,20 @@ export async function getRelayPoolsInfo(chain, substrateApi) {
     const poolAddressList = _poolInfo[0].toHuman();
     const poolAddress = poolAddressList[0];
     const poolId = _poolInfo[1].toPrimitive();
-    const [_bondedPool, _metadata] = await Promise.all([chainApi.api.query.nominationPools.bondedPools(poolId), chainApi.api.query.nominationPools.metadata(poolId)]);
+    const poolsPalletId = substrateApi.api.consts.nominationPools.palletId.toString();
+    const poolStashAccount = parsePoolStashAddress(substrateApi.api, 0, poolId, poolsPalletId);
+    const [_nominations, _bondedPool, _metadata, _minimumActiveStake] = await Promise.all([chainApi.api.query.staking.nominators(poolStashAccount), chainApi.api.query.nominationPools.bondedPools(poolId), chainApi.api.query.nominationPools.metadata(poolId), chainApi.api.query.staking.minimumActiveStake()]);
+    const minimumActiveStake = _minimumActiveStake.toPrimitive();
+    const nominations = _nominations.toJSON();
     const poolMetadata = _metadata.toPrimitive();
     const bondedPool = _bondedPool.toPrimitive();
-    const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+
+    // const poolName = transformPoolName(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+
+    const poolName = isHex(poolMetadata) ? hexToString(poolMetadata) : poolMetadata;
+    const isPoolOpen = bondedPool.state === 'Open';
+    const isPoolNominating = !!nominations && nominations.targets.length > 0;
+    const isPoolEarningReward = bondedPool.points > minimumActiveStake;
     nominationPools.push({
       id: poolId,
       address: poolAddress,
@@ -598,7 +614,8 @@ export async function getRelayPoolsInfo(chain, substrateApi) {
       bondedAmount: ((_bondedPool$points = bondedPool.points) === null || _bondedPool$points === void 0 ? void 0 : _bondedPool$points.toString()) || '0',
       roles: bondedPool.roles,
       memberCounter: bondedPool.memberCounter,
-      state: bondedPool.state
+      state: bondedPool.state,
+      isProfitable: isPoolOpen && isPoolNominating && isPoolEarningReward
     });
   }));
   return nominationPools;

package/koni/api/staking/bonding/utils.d.ts

@@ -2,6 +2,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { NominationInfo, NominatorMetadata, StakingStatus, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { ApiPromise } from '@polkadot/api';
 import { BN } from '@polkadot/util';
 export interface PalletNominationPoolsPoolMember {
@@ -93,6 +94,9 @@ export interface PalletIdentityRegistration {
         };
     };
 }
+export declare type PalletIdentitySuper = [string, {
+    Raw: string;
+}];
 export interface ValidatorExtraInfo {
     commission: string;
     blocked: false;
@@ -109,7 +113,16 @@ export interface TernoaStakingRewardsStakingRewardsData {
 }
 export declare function parsePoolStashAddress(api: ApiPromise, index: number, poolId: number, poolsPalletId: string): string;
 export declare function transformPoolName(input: string): string;
-export declare function parseIdentity(identityInfo: PalletIdentityRegistration | null): string | undefined;
+/**
+  * @returns
+  * <p>
+  * [0] - identity
+  * </p>
+  * <p>
+  * [1] - isReasonable (isVerified)
+  * </p>
+  *  */
+export declare function parseIdentity(substrateApi: _SubstrateApi, address: string, children?: string): Promise<[string | undefined, boolean]>;
 export declare function getInflationParams(networkKey: string): _SubstrateInflationParams;
 export declare function calcInflationUniformEraPayout(totalIssuance: BN, yearlyInflationInTokens: number): number;
 export declare function calcInflationRewardCurve(minInflation: number, stakedFraction: number, idealStake: number, idealInterest: number, falloff: number): number;
@@ -162,4 +175,4 @@ export declare function getStakingStatusByNominations(bnTotalActiveStake: BN, no
 export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";
 export declare const getMinStakeErrorMessage: (chainInfo: _ChainInfo, bnMinStake: BN) => string;
 export declare const getMaxValidatorErrorMessage: (chainInfo: _ChainInfo, max: number) => string;
-export declare const getExistUnstakeErrorMessage: (chain: string, isStakeMore?: boolean) => string;
+export declare const getExistUnstakeErrorMessage: (chain: string, type?: StakingType, isStakeMore?: boolean) => string;

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

@@ -5,10 +5,10 @@ import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extensio
 import { getAstarWithdrawable } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
-import { detectTranslate, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
+import { detectTranslate, isSameAddress, parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { t } from 'i18next';
-import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
+import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, hexToString, isHex, stringToU8a, u8aConcat } from '@polkadot/util';
 export let PalletParachainStakingRequestType;
 (function (PalletParachainStakingRequestType) {
   PalletParachainStakingRequestType["REVOKE"] = "revoke";
@@ -27,22 +27,63 @@ export function parsePoolStashAddress(api, index, poolId, poolsPalletId) {
 export function transformPoolName(input) {
   return input.replace(/[^\x20-\x7E]/g, '');
 }
-export function parseIdentity(identityInfo) {
-  let identity;
-  if (identityInfo) {
-    var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
-    const displayName = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
-    const web = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
-    const riot = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
-    const twitter = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
-    if (displayName && !displayName.startsWith('0x')) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      identity = displayName;
+
+/**
+  * @returns
+  * <p>
+  * [0] - identity
+  * </p>
+  * <p>
+  * [1] - isReasonable (isVerified)
+  * </p>
+  *  */
+export async function parseIdentity(substrateApi, address, children) {
+  const compactResult = rs => {
+    const result = [];
+    if (rs) {
+      result.push(rs);
+    }
+    if (children) {
+      result.push(children);
+    }
+    if (result.length > 0) {
+      return result.join('/');
     } else {
-      identity = twitter || web || riot;
+      return undefined;
+    }
+  };
+  if (substrateApi.api.query.identity) {
+    let identity;
+    const _parent = await substrateApi.api.query.identity.superOf(address);
+    const parentInfo = _parent.toHuman();
+    if (parentInfo) {
+      const [parentAddress, {
+        Raw: data
+      }] = parentInfo;
+      const child = isHex(data) ? hexToString(data) : data;
+      if (!isSameAddress(address, parentAddress)) {
+        const [rs, isReasonable] = await parseIdentity(substrateApi, parentAddress, child);
+        return [compactResult(rs), isReasonable];
+      }
+    }
+    const _identity = await substrateApi.api.query.identity.identityOf(address);
+    const identityInfo = _identity.toHuman();
+    if (identityInfo) {
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
+      const displayName = (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
+      const web = (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
+      const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
+      const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
+      const isReasonable = identityInfo.judgements.length > 0;
+      if (displayName && !displayName.startsWith('0x')) {
+        identity = displayName;
+      } else {
+        identity = twitter || web || riot;
+      }
+      return [compactResult(identity), isReasonable];
     }
   }
-  return identity;
+  return [undefined, false];
 }
 export function getInflationParams(networkKey) {
   return _KNOWN_CHAIN_INFLATION_PARAMS[networkKey] || _SUBSTRATE_DEFAULT_INFLATION_PARAMS;
@@ -297,7 +338,7 @@ export const getMaxValidatorErrorMessage = (chainInfo, max) => {
     }
   });
 };
-export const getExistUnstakeErrorMessage = (chain, isStakeMore) => {
+export const getExistUnstakeErrorMessage = (chain, type, isStakeMore) => {
   const label = getValidatorLabel(chain);
   if (!isStakeMore) {
     switch (label) {
@@ -306,7 +347,12 @@ export const getExistUnstakeErrorMessage = (chain, isStakeMore) => {
       case 'Collator':
         return t('You can unstake from a collator once');
       case 'Validator':
-        return t('You can unstake from a validator once');
+        {
+          if (type === StakingType.POOLED) {
+            return t('You can unstake from a pool once');
+          }
+          return t('You can unstake from a validator once');
+        }
     }
   } else {
     switch (label) {
@@ -315,7 +361,12 @@ export const getExistUnstakeErrorMessage = (chain, isStakeMore) => {
       case 'Collator':
         return t('You cannot stake more for a collator you are unstaking from');
       case 'Validator':
-        return t('You cannot stake more for a validator you are unstaking from');
+        {
+          if (type === StakingType.POOLED) {
+            return t('You cannot stake more for a pool you are unstaking from');
+          }
+          return t('You cannot stake more for a validator you are unstaking from');
+        }
     }
   }
 };

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();

package/koni/background/handlers/Extension.js

@@ -28,9 +28,8 @@ import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/reques
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
-import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
-import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
+import { convertSubjectInfoToAddresses, isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { createTransactionFromRLP, recalculateGasPrice, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
@@ -1725,7 +1724,7 @@ export default class KoniExtension {
     } = inputData;
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
-    const transaction = await getERC721Transaction(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
+    const transaction = await getERC721Transaction(this.#koniState.getEvmApi(networkKey), networkKey, contractAddress, senderAddress, recipientAddress, tokenId);
 
     // this.addContact(recipientAddress);
 
@@ -1872,7 +1871,8 @@ export default class KoniExtension {
               // null address
               from: address
             };
-            const gasPrice = await web3.api.eth.getGasPrice();
+            const _price = await web3.api.eth.getGasPrice();
+            const gasPrice = recalculateGasPrice(_price, networkKey);
             const gasLimit = await web3.api.eth.estimateGas(transaction);
             estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
           } else {

package/koni/background/handlers/Mobile.js

@@ -108,7 +108,7 @@ export default 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/koni/background/handlers/State.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="chrome" />
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, BalanceItem, BalanceJson, ChainStakingMetadata, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrentAccountInfo, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestSettingsType, ResponseAccountExportPrivateKey, ResponseCheckPublicAndSecretKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, ChainStakingMetadata, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrentAccountInfo, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestSettingsType, ResponseAccountExportPrivateKey, ResponseCheckPublicAndSecretKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountJson, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning } from '@subwallet/extension-base/background/types';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import BuyService from '@subwallet/extension-base/services/buy-service';
@@ -20,6 +20,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 } from '@subwallet/extension-base/types';
 import { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import SimpleKeyring from 'eth-simple-keyring';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -83,7 +84,7 @@ export default class KoniState {
     saveMetadata(meta: MetadataDef): void;
     sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
     get authSubjectV2(): BehaviorSubject<import("@subwallet/extension-base/background/types").AuthorizeRequest[]>;
-    generateDefaultBalanceMap(): Record<string, BalanceItem>;
+    generateDefaultBalanceMap(): BalanceMap;
     private afterChainServiceInit;
     init(): Promise<void>;
     initMantaPay(password: string): Promise<void>;
@@ -151,12 +152,13 @@ export default class KoniState {
     getAllAddresses(): string[];
     private removeInactiveChainBalances;
     getBalance(reset?: boolean): BalanceJson;
-    getStoredBalance(address: string): Promise<Record<string, BalanceItem>>;
+    getStoredBalance(address: string): Promise<BalanceMap>;
     handleSwitchAccount(newAddress: string): Promise<void>;
     resetBalanceMap(newAddress: string): Promise<void>;
     resetCrowdloanMap(newAddress: string): Promise<void>;
     resetStaking(newAddress: string): void;
-    setBalanceItem(tokenSlug: string, item: BalanceItem): void;
+    /** Note: items must be same tokenSlug */
+    setBalanceItem(items: BalanceItem[]): void;
     private updateBalanceStore;
     subscribeBalance(): Subject<BalanceJson>;
     getCrowdloan(reset?: boolean): CrowdloanJson;