@subwallet/extension-base 1.0.1 → 1.0.2-1

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

@@ -1,6 +1,7 @@
 /// <reference types="bn.js" />
 import { NominationInfo, NominatorMetadata, StakingType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateInflationParams } from '@subwallet/extension-base/services/chain-service/constants';
+import { ApiPromise } from '@polkadot/api';
 import { BN } from '@polkadot/util';
 export interface PalletNominationPoolsPoolMember {
     poolId: number;
@@ -64,6 +65,15 @@ export interface PalletParachainStakingDelegator {
     lessTotal: number;
     status: number;
 }
+export interface PalletStakingExposureItem {
+    who: string;
+    value: number;
+}
+export interface PalletStakingExposure {
+    total: number;
+    own: number;
+    others: PalletStakingExposureItem[];
+}
 export interface PalletIdentityRegistration {
     judgements: any[];
     deposit: number;
@@ -92,6 +102,7 @@ export interface Unlocking {
     remainingEras: BN;
     value: BN;
 }
+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;
 export declare function getInflationParams(networkKey: string): _SubstrateInflationParams;
@@ -137,6 +148,7 @@ export declare enum StakingAction {
     CLAIM_REWARD = "CLAIM_REWARD",
     CANCEL_UNSTAKE = "CANCEL_UNSTAKE"
 }
-export declare function getStakingAvailableActions(nominatorMetadata: NominatorMetadata): StakingAction[];
+export declare function getStakingAvailableActionsByChain(chain: string, type: StakingType): StakingAction[];
+export declare function getStakingAvailableActionsByNominator(nominatorMetadata: NominatorMetadata): StakingAction[];
 export declare function isActionFromValidator(stakingType: StakingType, chain: string): boolean;
 export declare function getWithdrawalInfo(nominatorMetadata: NominatorMetadata): UnstakingInfo | undefined;

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

@@ -4,13 +4,22 @@
 import { StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
-import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO } from '@polkadot/util';
+import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
 export let PalletParachainStakingRequestType;
 (function (PalletParachainStakingRequestType) {
   PalletParachainStakingRequestType["REVOKE"] = "revoke";
   PalletParachainStakingRequestType["DECREASE"] = "decrease";
   PalletParachainStakingRequestType["BOND_LESS"] = "bondLess";
 })(PalletParachainStakingRequestType || (PalletParachainStakingRequestType = {}));
+export function parsePoolStashAddress(api, index, poolId, poolsPalletId) {
+  const ModPrefix = stringToU8a('modl');
+  const U32Opts = {
+    bitLength: 32,
+    isLe: true
+  };
+  const EmptyH256 = new Uint8Array(32);
+  return api.registry.createType('AccountId32', u8aConcat(ModPrefix, poolsPalletId, new Uint8Array([index]), bnToU8a(new BN(poolId.toString()), U32Opts), EmptyH256)).toString();
+}
 export function transformPoolName(input) {
   return input.replace(/[^\x20-\x7E]/g, '');
 }
@@ -130,7 +139,9 @@ export function getBondedValidators(nominations) {
 export function isUnstakeAll(selectedValidator, nominations, unstakeAmount) {
   let isUnstakeAll = false;
   for (const nomination of nominations) {
-    if (nomination.validatorAddress === selectedValidator) {
+    const parsedValidatorAddress = reformatAddress(nomination.validatorAddress, 0);
+    const parsedSelectedValidator = reformatAddress(selectedValidator, 0);
+    if (parsedValidatorAddress === parsedSelectedValidator) {
       if (unstakeAmount === nomination.activeStake) {
         isUnstakeAll = true;
       }
@@ -147,7 +158,20 @@ export let StakingAction;
   StakingAction["CLAIM_REWARD"] = "CLAIM_REWARD";
   StakingAction["CANCEL_UNSTAKE"] = "CANCEL_UNSTAKE";
 })(StakingAction || (StakingAction = {}));
-export function getStakingAvailableActions(nominatorMetadata) {
+export function getStakingAvailableActionsByChain(chain, type) {
+  if (type === StakingType.POOLED) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CLAIM_REWARD];
+  }
+  if (_STAKING_CHAIN_GROUP.para.includes(chain)) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CANCEL_UNSTAKE];
+  } else if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CLAIM_REWARD];
+  } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW];
+  }
+  return [StakingAction.STAKE, StakingAction.UNSTAKE, StakingAction.WITHDRAW, StakingAction.CANCEL_UNSTAKE];
+}
+export function getStakingAvailableActionsByNominator(nominatorMetadata) {
   const result = [StakingAction.STAKE];
   const bnActiveStake = new BN(nominatorMetadata.activeStake);
   if (nominatorMetadata.activeStake && bnActiveStake.gt(BN_ZERO)) {

package/koni/api/xcm/index.js

@@ -27,115 +27,4 @@ export const createXcmExtrinsic = async ({
   }
   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';
-//       }
-//     }
-//   }
-// }
+};

package/koni/api/xcm/polkadotXcm.js

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

package/koni/api/xcm/xTokens.js

@@ -3,9 +3,8 @@
 
 import { FOUR_INSTRUCTIONS_WEIGHT, getReceiverLocation, NETWORK_USE_UNLIMITED_WEIGHT, POLKADOT_UNLIMITED_WEIGHT } from '@subwallet/extension-base/koni/api/xcm/utils';
 import { _XCM_TYPE } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getSubstrateParaId, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType, _getXcmTransferType, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getSubstrateParaId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType, _getXcmTransferType, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 function getCurrencyId(tokenInfo) {
-  var _tokenInfo$metadata2;
   if (['acala', 'karura'].includes(tokenInfo.originChain) && _isNativeToken(tokenInfo)) {
     return _getXcmAssetMultilocation(tokenInfo);
   } else if (['moonbeam', 'moonbase', 'moonriver'].includes(tokenInfo.originChain)) {
@@ -15,10 +14,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 _getXcmAssetMultilocation(tokenInfo);
   }
-  return (_tokenInfo$metadata2 = tokenInfo.metadata) === null || _tokenInfo$metadata2 === void 0 ? void 0 : _tokenInfo$metadata2.onChainInfo;
+  return _getTokenOnChainInfo(tokenInfo);
 }
 function getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, toAddress) {
   const xcmType = _getXcmTransferType(originChainInfo, destinationChainInfo);

package/koni/background/cron.js

@@ -48,73 +48,74 @@ export 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()), CRON_REFRESH_NFT_INTERVAL);
+      this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
+      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('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
+      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), 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()), 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()), CRON_REFRESH_NFT_INTERVAL);
         this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
-        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('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
-        this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
+        this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
+        this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+        this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
+        this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), 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()), CRON_REFRESH_NFT_INTERVAL);
-          this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
-          this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-          this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-          this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
-          this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
-        } else {
-          this.setStakingRewardReady();
-        }
-      }
-    });
     this.status = 'running';
   };
   stop = () => {
@@ -130,6 +131,7 @@ export 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) {
@@ -141,12 +143,10 @@ export class KoniCron {
         this.state.refreshWeb3Api(key);
       });
     }
-    this.state.getCurrentAccount(({
+    const {
       address
-    }) => {
-      var _this$subscriptions;
-      ((_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());
-    });
+    } = 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 () => {
@@ -156,7 +156,7 @@ export 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');