@subwallet/extension-base 1.0.1 → 1.0.2-1

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

@@ -19,6 +19,8 @@ exports.getRelayWithdrawalExtrinsic = getRelayWithdrawalExtrinsic;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
+var _utils3 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -66,30 +68,51 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   const chain = chainInfo.slug;
   const chainApi = await substrateApi.isReady;
   const [_ledger, _nominations, _currentEra, _bonded] = await Promise.all([chainApi.api.query.staking.ledger(address), chainApi.api.query.staking.nominators(address), chainApi.api.query.staking.currentEra(), chainApi.api.query.staking.bonded(address)]);
-  const ledger = _ledger.toJSON();
-  const nominations = _nominations.toJSON();
+  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+  const ledger = _ledger.toPrimitive();
+  const nominations = _nominations.toPrimitive();
   const currentEra = _currentEra.toString();
   const bonded = _bonded.toHuman();
   if (!ledger) {
     return;
   }
+  let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
   const activeStake = ledger.active.toString();
   const nominationList = [];
   const unstakingList = [];
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
-      const identityInfo = (await chainApi.api.query.identity.identityOf(validatorAddress)).toHuman();
+      let nominationStatus = _KoniTypes.StakingStatus.NOT_EARNING;
+      const [_identityInfo, _eraStaker] = await Promise.all([chainApi.api.query.identity.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const eraStaker = _eraStaker.toPrimitive();
+      const identityInfo = _identityInfo.toHuman();
       const identity = (0, _utils.parseIdentity)(identityInfo);
+      const topNominators = eraStaker.others.map(nominator => {
+        return nominator.who;
+      });
+      if (topNominators.slice(0, maxNominatorRewardedPerValidator).includes((0, _utils3.reformatAddress)(address, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
+        // if address in top nominators
+        nominationStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
+      }
       nominationList.push({
         chain,
         validatorAddress,
+        status: nominationStatus,
         validatorIdentity: identity,
         activeStake: '0' // relaychain allocates stake accordingly
       });
     }));
   }
 
+  for (const nomination of nominationList) {
+    if (nomination.status === _KoniTypes.StakingStatus.EARNING_REWARD) {
+      // only need 1 earning nomination to count
+      stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
+      break;
+    }
+  }
   ledger.unlocking.forEach(unlockingChunk => {
     const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
     const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
@@ -104,6 +127,7 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   return {
     chain,
     type: _KoniTypes.StakingType.NOMINATED,
+    status: stakingStatus,
     address: address,
     activeStake,
     nominations: nominationList,
@@ -114,17 +138,39 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
 async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi) {
   const chainApi = await substrateApi.isReady;
   const [_poolMemberInfo, _currentEra] = await Promise.all([chainApi.api.query.nominationPools.poolMembers(address), chainApi.api.query.staking.currentEra()]);
+  const _maxNominatorRewardedPerValidator = chainApi.api.consts.staking.maxNominatorRewardedPerValidator.toString();
+  const maxNominatorRewardedPerValidator = parseInt(_maxNominatorRewardedPerValidator);
+  const poolsPalletId = chainApi.api.consts.nominationPools.palletId.toString();
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
   const currentEra = _currentEra.toString();
   if (!poolMemberInfo) {
     return;
   }
+  let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);
   const poolMetadata = _poolMetadata.toPrimitive();
   const poolName = (0, _utils.transformPoolName)(poolMetadata.isUtf8 ? poolMetadata.toUtf8() : poolMetadata.toString());
+  const poolStashAccount = (0, _utils.parsePoolStashAddress)(chainApi.api, 0, poolMemberInfo.poolId, poolsPalletId);
+  const _nominations = await chainApi.api.query.staking.nominators(poolStashAccount);
+  const nominations = _nominations.toJSON();
+  if (nominations) {
+    const validatorList = nominations.targets;
+    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 => {
+        return nominator.who;
+      }).slice(0, maxNominatorRewardedPerValidator);
+      if (topNominators.includes((0, _utils3.reformatAddress)(poolStashAccount, (0, _utils2._getChainSubstrateAddressPrefix)(chainInfo)))) {
+        // if address in top nominators
+        stakingStatus = _KoniTypes.StakingStatus.EARNING_REWARD;
+      }
+    }));
+  }
   const joinedPoolInfo = {
     activeStake: poolMemberInfo.points.toString(),
     chain: chainInfo.slug,
+    status: stakingStatus,
     validatorIdentity: poolName,
     validatorAddress: poolMemberInfo.poolId.toString(),
     // use poolId
@@ -147,6 +193,7 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
     chain: chainInfo.slug,
     type: _KoniTypes.StakingType.POOLED,
     address,
+    status: stakingStatus,
     activeStake: poolMemberInfo.points.toString(),
     nominations: [joinedPoolInfo],
     // can only join 1 pool at a time
@@ -255,23 +302,31 @@ async function getRelayPoolsInfo(chain, substrateApi) {
   }));
   return nominationPools;
 }
-async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators, nominatorMetadata, chainInfo) {
-  let bondDest = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'Staked';
+async function getRelayBondingExtrinsic(substrateApi, amount, targetValidators, chainInfo, address, nominatorMetadata) {
+  let bondDest = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 'Staked';
   const chainApi = await substrateApi.isReady;
   const binaryAmount = new _util.BN(amount);
   let bondTx;
   let nominateTx;
+  const validatorParamList = targetValidators.map(validator => {
+    return validator.address;
+  });
+  if (!nominatorMetadata) {
+    bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
+    return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
+  }
   if (!nominatorMetadata.isBondedBefore) {
     // first time
     bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
-    nominateTx = chainApi.api.tx.staking.nominate(targetValidators);
+    nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   } else {
     if (binaryAmount.gt(_util.BN_ZERO)) {
       bondTx = chainApi.api.tx.staking.bondExtra(binaryAmount);
     }
     if (nominatorMetadata.isBondedBefore && targetValidators.length > 0) {
-      nominateTx = chainApi.api.tx.staking.nominate(targetValidators);
+      nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     }
   }
   if (bondTx && !nominateTx) {

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

@@ -14,12 +14,14 @@ exports.getBondedValidators = getBondedValidators;
 exports.getCommission = getCommission;
 exports.getInflationParams = getInflationParams;
 exports.getParaCurrentInflation = getParaCurrentInflation;
-exports.getStakingAvailableActions = getStakingAvailableActions;
+exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
+exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.isActionFromValidator = isActionFromValidator;
 exports.isShowNominationByValidator = isShowNominationByValidator;
 exports.isUnstakeAll = isUnstakeAll;
 exports.parseIdentity = parseIdentity;
+exports.parsePoolStashAddress = parsePoolStashAddress;
 exports.transformPoolName = transformPoolName;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
@@ -34,6 +36,15 @@ exports.PalletParachainStakingRequestType = PalletParachainStakingRequestType;
   PalletParachainStakingRequestType["DECREASE"] = "decrease";
   PalletParachainStakingRequestType["BOND_LESS"] = "bondLess";
 })(PalletParachainStakingRequestType || (exports.PalletParachainStakingRequestType = PalletParachainStakingRequestType = {}));
+function parsePoolStashAddress(api, index, poolId, poolsPalletId) {
+  const ModPrefix = (0, _util.stringToU8a)('modl');
+  const U32Opts = {
+    bitLength: 32,
+    isLe: true
+  };
+  const EmptyH256 = new Uint8Array(32);
+  return api.registry.createType('AccountId32', (0, _util.u8aConcat)(ModPrefix, poolsPalletId, new Uint8Array([index]), (0, _util.bnToU8a)(new _util.BN(poolId.toString()), U32Opts), EmptyH256)).toString();
+}
 function transformPoolName(input) {
   return input.replace(/[^\x20-\x7E]/g, '');
 }
@@ -153,7 +164,9 @@ function getBondedValidators(nominations) {
 function isUnstakeAll(selectedValidator, nominations, unstakeAmount) {
   let isUnstakeAll = false;
   for (const nomination of nominations) {
-    if (nomination.validatorAddress === selectedValidator) {
+    const parsedValidatorAddress = (0, _utils.reformatAddress)(nomination.validatorAddress, 0);
+    const parsedSelectedValidator = (0, _utils.reformatAddress)(selectedValidator, 0);
+    if (parsedValidatorAddress === parsedSelectedValidator) {
       if (unstakeAmount === nomination.activeStake) {
         isUnstakeAll = true;
       }
@@ -171,7 +184,20 @@ exports.StakingAction = StakingAction;
   StakingAction["CLAIM_REWARD"] = "CLAIM_REWARD";
   StakingAction["CANCEL_UNSTAKE"] = "CANCEL_UNSTAKE";
 })(StakingAction || (exports.StakingAction = StakingAction = {}));
-function getStakingAvailableActions(nominatorMetadata) {
+function getStakingAvailableActionsByChain(chain, type) {
+  if (type === _KoniTypes.StakingType.POOLED) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CLAIM_REWARD];
+  }
+  if (_constants._STAKING_CHAIN_GROUP.para.includes(chain)) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CANCEL_UNSTAKE];
+  } else if (_constants._STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CLAIM_REWARD];
+  } else if (_constants._STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW];
+  }
+  return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CANCEL_UNSTAKE];
+}
+function getStakingAvailableActionsByNominator(nominatorMetadata) {
   const result = [StakingAction.STAKE];
   const bnActiveStake = new _util.BN(nominatorMetadata.activeStake);
   if (nominatorMetadata.activeStake && bnActiveStake.gt(_util.BN_ZERO)) {

package/cjs/koni/api/xcm/index.js

@@ -35,115 +35,4 @@ const createXcmExtrinsic = async _ref => {
   console.log('XCM extrinsic: ', extrinsic.toHex());
   return extrinsic;
 };
-
-// TODO: add + refine logic for more chains
-// export function updateXcmResponseTxResult (
-//   networkKey: string,
-//   tokenInfo: _ChainAsset,
-//   response: TransactionResponse,
-//   records: EventRecord[]
-// ) {
-//   if (!response.txResult) {
-//     response.txResult = { change: '0' };
-//   }
-//
-//   let isFeeUseMainTokenSymbol = true;
-//
-//   for (let index = 0; index < records.length; index++) {
-//     const record = records[index];
-//
-//     if (_XCM_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-//       if (record.event.section === 'currencies' &&
-//         record.event.method.toLowerCase() === 'transferred') {
-//         if (index === 0) {
-//           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-//           response.txResult.fee = record.event.data[3]?.toString() || '0';
-//           response.txResult.feeSymbol = tokenInfo.symbol;
-//
-//           isFeeUseMainTokenSymbol = false;
-//         } else {
-//           response.txResult.change = record.event.data[3]?.toString() || '0';
-//           response.txResult.changeSymbol = tokenInfo.symbol;
-//         }
-//       }
-//
-//       if (record.event.section === 'tokens' &&
-//         record.event.method.toLowerCase() === 'withdrawn') {
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       }
-//     } else if (_XCM_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-//       if (record.event.section === 'tokens' &&
-//         record.event.method.toLowerCase() === 'transfer') {
-//         response.txResult.change = record.event.data[3]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       }
-//     } else if (_XCM_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-//       if (record.event.section === 'eqBalances' &&
-//         record.event.method.toLowerCase() === 'transfer') {
-//         response.txResult.change = record.event.data[3]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       }
-//     } else if (_XCM_CHAIN_GROUP.bifrost.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-//       if (record.event.section === 'tokens' &&
-//         record.event.method.toLowerCase() === 'withdrawn') {
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       } else if (record.event.section === 'balances' &&
-//         record.event.method.toLowerCase() === 'transfer') {
-//         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       }
-//     } else if (_XCM_CHAIN_GROUP.astar.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-//       if (record.event.section === 'assets' &&
-//         record.event.method.toLowerCase() === 'burned') {
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       }
-//     } else if (_XCM_CHAIN_GROUP.moonbeam.includes(networkKey) && !_isNativeToken(tokenInfo)) {
-//       if (record.event.section === 'assets' &&
-//         record.event.method.toLowerCase() === 'burned') {
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//         response.txResult.changeSymbol = tokenInfo.symbol;
-//       }
-//     } else if (_XCM_CHAIN_GROUP.statemine.includes(networkKey)) {
-//       if (!_isNativeToken(tokenInfo)) {
-//         if (record.event.section === 'assets' &&
-//           record.event.method.toLowerCase() === 'transferred') {
-//           response.txResult.change = record.event.data[3]?.toString() || '0';
-//           response.txResult.changeSymbol = tokenInfo.symbol;
-//         }
-//       } else {
-//         if (record.event.section === 'balances' &&
-//           record.event.method.toLowerCase() === 'withdraw') {
-//           response.txResult.change = record.event.data[1]?.toString() || '0';
-//           response.txResult.changeSymbol = tokenInfo.symbol;
-//         }
-//       }
-//     } else {
-//       if (record.event.section === 'balances' &&
-//         record.event.method.toLowerCase() === 'transfer') {
-//         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//       } else if (record.event.section === 'xTokens' &&
-//         record.event.method.toLowerCase() === 'transferred') {
-//         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-//         response.txResult.change = record.event.data[2]?.toString() || '0';
-//       }
-//     }
-//
-//     if (isFeeUseMainTokenSymbol && record.event.section === 'balances' && record.event.method.toLowerCase() === 'withdraw') {
-//       if (!response.txResult.fee) {
-//         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-//         response.txResult.fee = record.event.data[1]?.toString() || '0';
-//       }
-//     } else if (isFeeUseMainTokenSymbol && record.event.section === 'tokens' && record.event.method.toLowerCase() === 'withdrawn') {
-//       if (!response.txResult.fee) {
-//         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-//         response.txResult.fee = record.event.data[2]?.toString() || '0';
-//       }
-//     }
-//   }
-// }
 exports.createXcmExtrinsic = createXcmExtrinsic;

package/cjs/koni/api/xcm/polkadotXcm.js

@@ -48,7 +48,7 @@ function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destination
   const assetLocation = getAssetLocation(tokenInfo, value);
   let method = 'limitedReserveTransferAssets';
   if (['astar', 'shiden'].includes(originChainInfo.slug)) {
-    method = 'reserveWithdrawAssets';
+    method = 'limitedReserveWithdrawAssets';
   } else if ((0, _utils2._isSubstrateRelayChain)(destinationChainInfo)) {
     method = 'limitedTeleportAssets';
   }

package/cjs/koni/api/xcm/xTokens.js

@@ -11,7 +11,6 @@ var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 // SPDX-License-Identifier: Apache-2.0
 
 function getCurrencyId(tokenInfo) {
-  var _tokenInfo$metadata2;
   if (['acala', 'karura'].includes(tokenInfo.originChain) && (0, _utils2._isNativeToken)(tokenInfo)) {
     return (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
   } else if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {
@@ -21,10 +20,9 @@ function getCurrencyId(tokenInfo) {
       [tokenType]: assetId
     };
   } else if (['pioneer'].includes(tokenInfo.originChain)) {
-    var _tokenInfo$metadata;
-    return (_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.multilocation;
+    return (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
   }
-  return (_tokenInfo$metadata2 = tokenInfo.metadata) === null || _tokenInfo$metadata2 === void 0 ? void 0 : _tokenInfo$metadata2.onChainInfo;
+  return (0, _utils2._getTokenOnChainInfo)(tokenInfo);
 }
 function getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, toAddress) {
   const xcmType = (0, _utils2._getXcmTransferType)(originChainInfo, destinationChainInfo);

package/cjs/koni/background/cron.js

@@ -59,73 +59,74 @@ class KoniCron {
     });
   };
   init = () => {
-    this.state.getCurrentAccount(currentAccountInfo => {
-      if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
-        return;
-      }
-      if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
-        this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap());
-        this.refreshStakingReward(currentAccountInfo.address);
-        this.refreshStakingRewardFastInterval(currentAccountInfo.address);
-        this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
-        this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
-      } else {
-        this.setStakingRewardReady();
-      }
-    });
+    const currentAccountInfo = this.state.keyringService.currentAccount;
+    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
+      return;
+    }
+    if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
+      this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap());
+      this.refreshStakingReward(currentAccountInfo.address);
+      this.refreshStakingRewardFastInterval(currentAccountInfo.address);
+      this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
+      this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
+    } else {
+      this.setStakingRewardReady();
+    }
   };
   start = () => {
     if (this.status === 'running') {
       return;
     }
     this.logger.log('Starting cron jobs');
-    this.state.getCurrentAccount(currentAccountInfo => {
-      if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
+    const currentAccountInfo = this.state.keyringService.currentAccount;
+    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
+      return;
+    }
+    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('recoverApiMap', this.recoverApiMap, _constants.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
+      this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
+      this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+      this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
+      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
+    } else {
+      this.setStakingRewardReady();
+    }
+    const reloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'chain.update', 'chain.enable', 'asset.update', 'asset.enable', 'transaction.done', 'transaction.failed'];
+    this.state.eventService.onLazy((events, eventTypes) => {
+      var _serviceInfo$currentA;
+      const serviceInfo = this.state.getServiceInfo();
+      const needReload = eventTypes.some(eT => reloadEvents.includes(eT));
+      if (!needReload) {
+        return;
+      }
+      this.logger.log('ServiceInfo updated, restarting...');
+      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
+      if (!address) {
         return;
       }
-      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.resetStakingReward();
+      this.resetNft(address);
+      this.removeCron('refreshNft');
+      this.removeCron('refreshStakingReward');
+      this.removeCron('refreshPoolingStakingReward');
+      this.removeCron('checkStatusApiMap');
+      this.removeCron('recoverApiMap');
+      this.removeCron('updateChainStakingMetadata');
+      this.removeCron('updateNominatorMetadata');
+      if (this.checkNetworkAvailable(serviceInfo)) {
+        // only add cron job if there's at least 1 active network
+        this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
         this.addCron('recoverApiMap', this.recoverApiMap, _constants.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
-        this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
-        this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-        this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
-        this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
+        this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
+        this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+        this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
+        this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
       } else {
         this.setStakingRewardReady();
       }
     });
-    this.serviceSubscription = this.state.subscribeServiceInfo().subscribe({
-      next: serviceInfo => {
-        var _serviceInfo$currentA;
-        this.logger.log('ServiceInfo updated, restarting...');
-        const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
-        if (!address) {
-          return;
-        }
-        this.resetStakingReward();
-        this.resetNft(address);
-        this.removeCron('refreshNft');
-        this.removeCron('refreshStakingReward');
-        this.removeCron('refreshPoolingStakingReward');
-        this.removeCron('refreshPrice');
-        this.removeCron('checkStatusApiMap');
-        this.removeCron('recoverApiMap');
-        this.removeCron('updateChainStakingMetadata');
-        this.removeCron('updateNominatorMetadata');
-        if (this.checkNetworkAvailable(serviceInfo)) {
-          // only add cron job if there's at least 1 active network
-          this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-          this.addCron('recoverApiMap', this.recoverApiMap, _constants.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
-          this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
-          this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-          this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
-          this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
-        } else {
-          this.setStakingRewardReady();
-        }
-      }
-    });
     this.status = 'running';
   };
   stop = () => {
@@ -141,6 +142,7 @@ class KoniCron {
     this.status = 'stopped';
   };
   recoverApiMap = () => {
+    var _this$subscriptions;
     const apiMap = this.state.getApiMap();
     for (const [networkKey, apiProp] of Object.entries(apiMap.substrate)) {
       if (!apiProp.isApiConnected) {
@@ -152,13 +154,10 @@ class KoniCron {
         this.state.refreshWeb3Api(key);
       });
     }
-    this.state.getCurrentAccount(_ref2 => {
-      var _this$subscriptions;
-      let {
-        address
-      } = _ref2;
-      ((_this$subscriptions = this.subscriptions) === null || _this$subscriptions === void 0 ? void 0 : _this$subscriptions.subscribeBalancesAndCrowdloans) && this.subscriptions.subscribeBalancesAndCrowdloans(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
-    });
+    const {
+      address
+    } = this.state.keyringService.currentAccount;
+    ((_this$subscriptions = this.subscriptions) === null || _this$subscriptions === void 0 ? void 0 : _this$subscriptions.subscribeBalancesAndCrowdloans) && this.subscriptions.subscribeBalancesAndCrowdloans(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {
@@ -168,7 +167,7 @@ class KoniCron {
   };
   resetNft = newAddress => {
     this.logger.log('Reset Nft state');
-    this.state.resetNft(newAddress).catch(e => this.logger.warn(e));
+    this.state.resetNft(newAddress);
   };
   resetStakingReward = () => {
     this.logger.log('Reset Staking Reward State');