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

package/koni/api/nft/rmrk_nft/index.js

@@ -129,7 +129,6 @@ export class RmrkNftApi extends BaseNftApi {
       const kusamaAddress = reformatAddress(address, 2);
       allNfts = await this.getAllByAccount(kusamaAddress);
       if (allNfts.length <= 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionInfoUrl = [];
@@ -237,9 +236,6 @@ export class RmrkNftApi extends BaseNftApi {
         });
         params.updateCollection(this.chain, parsedCollection);
       });
-      const allCollectionIds = allCollections.map(item => item.collectionId);
-      const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
-      params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

package/koni/api/nft/statemine_nft/index.js

@@ -86,7 +86,6 @@ export default class StatemineNftApi extends BaseNftApi {
     const assetIds = await this.getNfts([address]);
     try {
       if (!assetIds || assetIds.length === 0) {
-        params.cleanUpNfts(this.chain, address, [], [], true);
         return;
       }
       const collectionIds = [];
@@ -117,7 +116,6 @@ export default class StatemineNftApi extends BaseNftApi {
         };
         params.updateCollection(this.chain, parsedCollection);
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

package/koni/api/nft/unique_nft/index.js

@@ -133,8 +133,6 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }
       }));
-      const collectionIds = [];
-      let allNftIds = [];
       await Promise.all(allCollectionId.map(async collectionId => {
         const collectionIdStr = collectionId.toString();
 
@@ -142,8 +140,6 @@ export default class UniqueNftApi extends BaseNftApi {
         const collection = (await this.substrateApi.api.query.nft.collectionById(collectionId)).toJSON();
         collectionMap[collectionIdStr] = collection;
         const nftIds = Object.entries(nftMap).filter(item => item[1] === collectionId).map(item => item[0]);
-        collectionIds.push(collectionIdStr);
-        allNftIds = allNftIds.concat(nftIds);
         const parsedCollection = {
           collectionId: collectionIdStr,
           chain: this.chain
@@ -173,7 +169,6 @@ export default class UniqueNftApi extends BaseNftApi {
           }
         }));
       }));
-      params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
       console.error(`${this.chain}`, e);
     }

package/koni/api/nft/wasm_nft/index.js

@@ -324,7 +324,6 @@ export class WasmNftApi extends BaseNftApi {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const balance = _balance.output ? balanceJson.ok || balanceJson.Ok : '0';
       if (parseInt(balance) === 0) {
-        nftParams.cleanUpNfts(this.chain, address, [smartContract], []);
         return;
       }
       const itemIndexes = [];
@@ -408,9 +407,6 @@ export class WasmNftApi extends BaseNftApi {
         originAsset: tokenInfo.slug
       };
       nftParams.updateCollection(this.chain, nftCollection);
-      Object.entries(nftOwnerMap).forEach(([owner, nftIds]) => {
-        nftParams.cleanUpNfts(this.chain, owner, [smartContract], nftIds);
-      });
     }
   }
   async fetchNfts(params) {

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

@@ -89,14 +89,14 @@ export async function subscribeAmplitudeNominatorMetadata(chainInfo, address, su
     const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
     const blockDuration = (_STAKING_ERA_LENGTH_MAP[chainInfo.slug] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber <= 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - (currentBlockNumber + 1);
+    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
+    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
     const waitingTime = remainingBlock * blockDuration;
     unstakingList.push({
       chain: chainInfo.slug,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0,
+      waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }
@@ -165,14 +165,14 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
     const nearestUnstakingAmount = Object.values(unstakingInfo)[0];
     const blockDuration = (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default) / blockPerRound; // in hours
 
-    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber <= 0;
-    const remainingBlock = parseInt(nearestUnstakingBlock) - (currentBlockNumber + 1);
+    const isClaimable = parseInt(nearestUnstakingBlock) - currentBlockNumber < 0;
+    const remainingBlock = parseInt(nearestUnstakingBlock) - currentBlockNumber;
     const waitingTime = remainingBlock * blockDuration;
     unstakingList.push({
       chain,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: nearestUnstakingAmount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0,
+      waitingTime,
       validatorAddress: (delegatorState === null || delegatorState === void 0 ? void 0 : delegatorState.owner) || undefined
     });
   }

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

@@ -111,14 +111,14 @@ export async function subscribeAstarNominatorMetadata(chainInfo, address, substr
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
     for (const unlockingChunk of unlockingChunks) {
-      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
-      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) < 0;
+      const remainingEra = unlockingChunk.unlockEra - parseInt(currentEra);
       const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
       unstakingList.push({
         chain: chainInfo.slug,
         status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
-        waitingTime: waitingTime > 0 ? waitingTime : 0
+        waitingTime
       });
     }
   }
@@ -199,14 +199,14 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
     for (const unlockingChunk of unlockingChunks) {
-      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
-      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) < 0;
+      const remainingEra = unlockingChunk.unlockEra - parseInt(currentEra);
       const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
       unstakingList.push({
         chain,
         status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
         claimable: unlockingChunk.amount.toString(),
-        waitingTime: waitingTime > 0 ? waitingTime : 0
+        waitingTime
       });
     }
   }

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

@@ -162,8 +162,8 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
       for (const scheduledRequest of delegationScheduledRequests) {
         if (reformatAddress(scheduledRequest.delegator, 0) === reformatAddress(address, 0)) {
           // add network prefix
-          const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
-          const remainingEra = scheduledRequest.whenExecutable - (currentRound + 1);
+          const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
+          const remainingEra = scheduledRequest.whenExecutable - currentRound;
           const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
           const claimable = Object.values(scheduledRequest.action)[0];
           unstakingMap[delegation.owner] = {
@@ -171,7 +171,7 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
             status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
-            waitingTime: waitingTime > 0 ? waitingTime : 0
+            waitingTime
           };
           hasUnstaking = true;
           break; // only handle 1 scheduledRequest per collator
@@ -254,7 +254,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
       for (const scheduledRequest of delegationScheduledRequests) {
         if (reformatAddress(scheduledRequest.delegator, 0) === reformatAddress(address, 0)) {
           // add network prefix
-          const isClaimable = scheduledRequest.whenExecutable - currentRound <= 0;
+          const isClaimable = scheduledRequest.whenExecutable - currentRound < 0;
           const remainingEra = scheduledRequest.whenExecutable - (currentRound + 1);
           const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
           const claimable = Object.values(scheduledRequest.action)[0];
@@ -263,7 +263,7 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
             status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
             validatorAddress: delegation.owner,
             claimable: claimable.toString(),
-            waitingTime: waitingTime > 0 ? waitingTime : 0
+            waitingTime: waitingTime
           };
           hasUnstaking = true;
           break; // only handle 1 scheduledRequest per collator

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

@@ -214,14 +214,14 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
-    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
-    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
+    const remainingEra = unlockingChunk.era - parseInt(currentEra);
     const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -313,14 +313,14 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
     }
   }
   ledger.unlocking.forEach(unlockingChunk => {
-    const isClaimable = unlockingChunk.era - parseInt(currentEra) <= 0;
-    const remainingEra = unlockingChunk.era - (parseInt(currentEra) + 1);
+    const isClaimable = unlockingChunk.era - parseInt(currentEra) < 0;
+    const remainingEra = unlockingChunk.era - parseInt(currentEra);
     const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
     unstakingList.push({
       chain,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: unlockingChunk.value.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   return {
@@ -370,14 +370,14 @@ export async function subscribeRelayChainPoolMemberMetadata(chainInfo, address,
   };
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
-    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
-    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
+    const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
     const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
@@ -447,14 +447,14 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   };
   const unstakings = [];
   Object.entries(poolMemberInfo.unbondingEras).forEach(([unlockingEra, amount]) => {
-    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) <= 0;
-    const remainingEra = parseInt(unlockingEra) - (parseInt(currentEra) + 1);
+    const isClaimable = parseInt(unlockingEra) - parseInt(currentEra) < 0;
+    const remainingEra = parseInt(unlockingEra) - parseInt(currentEra);
     const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chainInfo.slug];
     unstakings.push({
       chain: chainInfo.slug,
       status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
       claimable: amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
+      waitingTime: waitingTime
     });
   });
   const bnActiveStake = new BN(poolMemberInfo.points.toString());
@@ -588,17 +588,27 @@ export async function getRelayBondingExtrinsic(substrateApi, amount, targetValid
   const binaryAmount = new BN(amount);
   let bondTx;
   let nominateTx;
+  const _params = chainApi.api.tx.staking.bond.toJSON();
+  const paramsCount = _params.args.length;
   const validatorParamList = targetValidators.map(validator => {
     return validator.address;
   });
   if (!nominatorMetadata) {
-    bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      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);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   } else {

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

@@ -189,13 +189,7 @@ export function getStakingAvailableActionsByNominator(nominatorMetadata, unclaim
   }
   if (nominatorMetadata.unstakings.length > 0) {
     result.push(StakingAction.CANCEL_UNSTAKE);
-    let hasClaimable = false;
-    for (const unstaking of nominatorMetadata.unstakings) {
-      if (unstaking.status === UnstakingStatus.CLAIMABLE) {
-        hasClaimable = true;
-        break;
-      }
-    }
+    const hasClaimable = nominatorMetadata.unstakings.some(unstaking => unstaking.status === UnstakingStatus.CLAIMABLE);
     if (hasClaimable) {
       result.push(StakingAction.WITHDRAW);
     }

package/koni/api/xcm/xTokens.js

@@ -19,6 +19,6 @@ function getCurrencyId(tokenInfo) {
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main', 'acala'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/koni/background/cron.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ApiMap, ServiceInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { KoniSubscription } from '@subwallet/extension-base/koni/background/subscription';
-import { _ChainState, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { Subject } from 'rxjs';
 import KoniState from './handlers/State';
@@ -27,15 +26,11 @@ export declare class KoniCron {
     syncMantaPay: () => void;
     refreshNft: (address: string, apiMap: ApiMap, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>) => () => void;
     resetNft: (newAddress: string) => void;
-    resetStakingReward: () => void;
     refreshStakingReward: (address: string) => () => void;
     refreshStakingRewardFastInterval: (address: string) => () => void;
     setStakingRewardReady: () => void;
     checkNetworkAvailable: (serviceInfo: ServiceInfo) => boolean;
-    updateChainStakingMetadata: (chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
-    updateNominatorMetadata: (address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
     private needUpdateNft;
-    private needUpdateStaking;
 }

package/koni/background/cron.js

@@ -1,8 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_REFRESH_CHAIN_STAKING_METADATA, 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 { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
+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 { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
 import { logger as createLogger } from '@polkadot/util';
@@ -61,7 +61,6 @@ export class KoniCron {
       const serviceInfo = this.state.getServiceInfo();
       const commonReload = eventTypes.some(eventType => commonReloadEvents.includes(eventType));
       const chainUpdated = eventTypes.includes('chain.updateState');
-      const stakingSubmitted = eventTypes.includes('transaction.submitStaking');
       const reloadMantaPay = eventTypes.includes('mantaPay.submitTransaction') || eventTypes.includes('mantaPay.enable');
       const updatedChains = [];
       if (chainUpdated) {
@@ -72,7 +71,7 @@ export class KoniCron {
           }
         });
       }
-      if (!commonReload && !chainUpdated && !stakingSubmitted && !reloadMantaPay) {
+      if (!commonReload && !chainUpdated && !reloadMantaPay) {
         return;
       }
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
@@ -81,7 +80,6 @@ export class KoniCron {
       }
       const chainInfoMap = serviceInfo.chainInfoMap;
       const needUpdateNft = this.needUpdateNft(chainInfoMap, updatedChains);
-      const needUpdateStaking = this.needUpdateStaking(chainInfoMap, updatedChains);
 
       // MantaPay
       reloadMantaPay && this.removeCron('syncMantaPay');
@@ -90,19 +88,10 @@ export class KoniCron {
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
 
-      // Staking
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.resetStakingReward();
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshPoolingStakingReward');
-      needUpdateStaking && this.removeCron('updateChainStakingMetadata');
-
       // Chains
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron job if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-        needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
       } else {
         this.setStakingRewardReady();
@@ -117,7 +106,6 @@ export class KoniCron {
       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('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('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();
@@ -155,9 +143,6 @@ export class KoniCron {
   resetNft = newAddress => {
     this.state.resetNft(newAddress);
   };
-  resetStakingReward = () => {
-    this.state.resetStakingReward();
-  };
   refreshStakingReward = address => {
     return () => {
       this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
@@ -174,16 +159,6 @@ export class KoniCron {
   checkNetworkAvailable = serviceInfo => {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };
-  updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
-    return () => {
-      this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
-    };
-  };
-  updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
-    return () => {
-      this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
-    };
-  };
   async reloadNft() {
     const address = this.state.keyringService.currentAccount.address;
     const serviceInfo = this.state.getServiceInfo();
@@ -195,11 +170,7 @@ export class KoniCron {
   }
   async reloadStaking() {
     const address = this.state.keyringService.currentAccount.address;
-    this.resetStakingReward();
-    this.removeCron('refreshStakingReward');
-    this.removeCron('refreshPoolingStakingReward');
-    this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-    this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+    console.log('reload staking', address);
     await waitTimeout(1800);
     return true;
   }
@@ -212,10 +183,4 @@ export class KoniCron {
     }
     return false;
   }
-  needUpdateStaking(chainInfoMap, updatedChains) {
-    if (updatedChains && updatedChains.length > 0) {
-      return updatedChains.some(updatedChain => _isChainSupportSubstrateStaking(chainInfoMap[updatedChain]));
-    }
-    return false;
-  }
 }

package/koni/background/handlers/Extension.d.ts

@@ -76,6 +76,8 @@ export default class KoniExtension {
     private setAutoLockTime;
     private subscribeSettings;
     private setEnableChainPatrol;
+    private setShowZeroBalance;
+    private setLanguage;
     private subscribeAuthUrls;
     private _saveCurrentAccountAddress;
     private updateCurrentAccountAddress;

package/koni/background/handlers/Extension.js

@@ -828,32 +828,24 @@ export default class KoniExtension {
     });
     return true;
   }
-  saveTheme(data, id, port) {
-    const cb = createSubscription(id, port);
-    this.#koniState.setTheme(data, cb);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
-    });
+  saveTheme(data) {
+    this.#koniState.updateSetting('theme', data);
     return true;
   }
   setCamera({
     camera
   }) {
-    this.#koniState.setCamera(camera);
+    this.#koniState.updateSetting('camera', camera);
     return true;
   }
-  saveBrowserConfirmationType(data, id, port) {
-    const cb = createSubscription(id, port);
-    this.#koniState.setBrowserConfirmationType(data, cb);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
-    });
+  saveBrowserConfirmationType(data) {
+    this.#koniState.updateSetting('browserConfirmationType', data);
     return true;
   }
   setAutoLockTime({
     autoLockTime
   }) {
-    this.#koniState.setAutoLockTime(autoLockTime);
+    this.#koniState.updateSetting('timeAutoLock', autoLockTime);
     return true;
   }
   async subscribeSettings(id, port) {
@@ -872,7 +864,19 @@ export default class KoniExtension {
   setEnableChainPatrol({
     enable
   }) {
-    this.#koniState.setEnableChainPatrol(enable);
+    this.#koniState.updateSetting('enableChainPatrol', enable);
+    return true;
+  }
+  setShowZeroBalance({
+    show
+  }) {
+    this.#koniState.updateSetting('isShowZeroBalance', show);
+    return true;
+  }
+  setLanguage({
+    language
+  }) {
+    this.#koniState.updateSetting('language', language);
     return true;
   }
   async subscribeAuthUrls(id, port) {
@@ -3402,13 +3406,17 @@ export default class KoniExtension {
       case 'pri(settings.saveCamera)':
         return this.setCamera(request);
       case 'pri(settings.saveTheme)':
-        return this.saveTheme(request, id, port);
+        return this.saveTheme(request);
       case 'pri(settings.saveBrowserConfirmationType)':
-        return this.saveBrowserConfirmationType(request, id, port);
+        return this.saveBrowserConfirmationType(request);
       case 'pri(settings.saveAutoLockTime)':
         return this.setAutoLockTime(request);
       case 'pri(settings.saveEnableChainPatrol)':
         return this.setEnableChainPatrol(request);
+      case 'pri(settings.saveShowZeroBalance)':
+        return this.setShowZeroBalance(request);
+      case 'pri(settings.saveLanguage)':
+        return this.setLanguage(request);
       case 'pri(price.getPrice)':
         return await this.getPrice();
       case 'pri(price.getSubscription)':

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, BrowserConfirmationType, ChainStakingMetadata, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrentAccountInfo, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestSettingsType, ResponseAccountExportPrivateKey, ResponseCheckPublicAndSecretKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, ThemeNames, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { AddTokenRequestExternal, AmountData, ApiMap, AuthRequestV2, BalanceItem, BalanceJson, ChainStakingMetadata, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrentAccountInfo, EvmSendTransactionParams, ExternalRequestPromise, MantaPayConfig, 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 { ChainService } from '@subwallet/extension-base/services/chain-service';
@@ -138,11 +138,7 @@ export default class KoniState {
     get signSubject(): BehaviorSubject<import("@subwallet/extension-base/background/types").SigningRequest[]>;
     getSettings(callback: (settings: UiSettings) => void): void;
     setSettings(settings: UiSettings, callback?: () => void): void;
-    setTheme(theme: ThemeNames, callback?: (settingData: UiSettings) => void): void;
-    setBrowserConfirmationType(browserConfirmationType: BrowserConfirmationType, callback?: (settingData: UiSettings) => void): void;
-    setCamera(value: boolean): void;
-    setAutoLockTime(value: number): void;
-    setEnableChainPatrol(value: boolean): void;
+    updateSetting<T extends keyof UiSettings>(key: T, value: UiSettings[T]): void;
     subscribeSettingsSubject(): Subject<RequestSettingsType>;
     getAccountAddress(): string | null;
     getDecodedAddresses(address?: string): string[];

package/koni/background/handlers/State.js

@@ -605,51 +605,11 @@ export default class KoniState {
   setSettings(settings, callback) {
     this.settingService.setSettings(settings, callback);
   }
-  setTheme(theme, callback) {
+  updateSetting(key, value) {
     this.settingService.getSettings(settings => {
       const newSettings = {
         ...settings,
-        theme
-      };
-      this.settingService.setSettings(newSettings, () => {
-        callback && callback(newSettings);
-      });
-    });
-  }
-  setBrowserConfirmationType(browserConfirmationType, callback) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        browserConfirmationType
-      };
-      this.settingService.setSettings(newSettings, () => {
-        callback && callback(newSettings);
-      });
-    });
-  }
-  setCamera(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        camera: value
-      };
-      this.settingService.setSettings(newSettings);
-    });
-  }
-  setAutoLockTime(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        timeAutoLock: value
-      };
-      this.settingService.setSettings(newSettings);
-    });
-  }
-  setEnableChainPatrol(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        enableChainPatrol: value
+        [key]: value
       };
       this.settingService.setSettings(newSettings);
     });
@@ -1535,10 +1495,13 @@ export default class KoniState {
     });
   }
   async reloadNft() {
+    const currentAddress = this.keyringService.currentAccount.address;
+    await this.dbService.removeNftsByAddress(currentAddress);
     return await this.cron.reloadNft();
   }
   async reloadStaking() {
-    return await this.cron.reloadStaking();
+    await this.subscription.reloadStaking();
+    return true;
   }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {