@subwallet/extension-base 1.0.2-1 → 1.0.2-1b

package/koni/background/handlers/Extension.js

@@ -6,15 +6,15 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, DEFAULT_TIME_AUTO_LOCK } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
 import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
 import { getNftTransferExtrinsic, isRecipientSelf } from '@subwallet/extension-base/koni/api/nft/transfer';
-import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrinsic, getNominationPoolsInfo, getUnbondingExtrinsic, getValidatorsInfo, getWithdrawalExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding';
+import { getBondingExtrinsic, getCancelWithdrawalExtrinsic, getClaimRewardExtrinsic, getNominationPoolsInfo, getUnbondingExtrinsic, getValidatorsInfo, getWithdrawalExtrinsic, validateBondingCondition, validateUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getTuringCancelCompoundingExtrinsic, getTuringCompoundExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/paraChain';
-import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
+import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic, validatePoolBondingCondition, validateRelayUnbondingCondition } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject } from '@subwallet/extension-base/koni/api/tokens/evm/transfer';
 import { getPSP34TransferExtrinsic } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
@@ -401,35 +401,38 @@ export default class KoniExtension {
   }
   async accountsGetAllWithCurrentAddress(id, port) {
     const cb = createSubscription(id, port);
-    return await new Promise(resolve => {
-      const subscription = accountsObservable.subject.subscribe(storedAccounts => {
-        const transformedAccounts = transformAccounts(storedAccounts);
-        const accounts = transformedAccounts && transformedAccounts.length ? [{
-          ...ACCOUNT_ALL_JSON
-        }, ...transformedAccounts] : [];
-        const accountsWithCurrentAddress = {
-          accounts
-        };
-        setTimeout(() => {
-          const accountInfo = this.#koniState.keyringService.currentAccount;
-          if (accountInfo) {
-            accountsWithCurrentAddress.currentAddress = accountInfo.address;
-            if (accountInfo.address === ALL_ACCOUNT_KEY) {
-              accountsWithCurrentAddress.currentGenesisHash = accountInfo.currentGenesisHash;
-            } else {
-              const acc = accounts.find(a => a.address === accountInfo.address);
-              accountsWithCurrentAddress.currentGenesisHash = (acc === null || acc === void 0 ? void 0 : acc.genesisHash) || ALL_GENESIS_HASH;
-            }
-          }
-          resolve(accountsWithCurrentAddress);
-          cb(accountsWithCurrentAddress);
-        }, 300);
-      });
-      this.createUnsubscriptionHandle(id, subscription.unsubscribe);
-      port.onDisconnect.addListener(() => {
-        this.cancelSubscription(id);
-      });
+    const keyringService = this.#koniState.keyringService;
+    await this.#koniState.eventService.waitAccountReady;
+    const currentAccount = keyringService.currentAccount;
+    const accountsSubject = keyring.accounts.subject;
+    const transformedAccounts = transformAccounts(accountsSubject.value);
+    const responseData = {
+      accounts: transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [{
+        ...ACCOUNT_ALL_JSON
+      }, ...transformedAccounts] : [],
+      currentAddress: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.address,
+      currentGenesisHash: currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.currentGenesisHash
+    };
+    const subscriptionAccounts = accountsSubject.subscribe(storedAccounts => {
+      const transformedAccounts = transformAccounts(storedAccounts);
+      responseData.accounts = transformedAccounts !== null && transformedAccounts !== void 0 && transformedAccounts.length ? [{
+        ...ACCOUNT_ALL_JSON
+      }, ...transformedAccounts] : [];
+      cb(responseData);
+    });
+    const subscriptionCurrentAccount = keyringService.currentAccountSubject.subscribe(currentAccountData => {
+      responseData.currentAddress = currentAccountData.address;
+      responseData.currentGenesisHash = currentAccountData.currentGenesisHash;
+      cb(responseData);
+    });
+    this.createUnsubscriptionHandle(id, () => {
+      subscriptionAccounts.unsubscribe();
+      subscriptionCurrentAccount.unsubscribe();
+    });
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
     });
+    return responseData;
   }
   accountsGetAll(id, port) {
     const cb = createSubscription(id, port);
@@ -450,11 +453,15 @@ export default class KoniExtension {
   }) {
     return keyring.saveRecent(accountId);
   }
-  triggerAccountsSubscription() {
-    const accountsSubject = accountsObservable.subject;
-    accountsSubject.next(accountsSubject.getValue());
-    return true;
-  }
+
+  // private triggerAccountsSubscription (): boolean {
+  //   const accountsSubject = accountsObservable.subject;
+  //
+  //   accountsSubject.next(accountsSubject.getValue());
+  //
+  //   return true;
+  // }
+
   _getAuthListV2() {
     return new Promise((resolve, reject) => {
       this.#koniState.getAuthorize(rs => {
@@ -806,8 +813,12 @@ export default class KoniExtension {
     } else {
       accountInfo.address = address;
       if (address !== ALL_ACCOUNT_KEY) {
-        const currentKeyPair = keyring.getAccount(address);
-        accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || ALL_GENESIS_HASH;
+        try {
+          const currentKeyPair = keyring.getPair(address);
+          accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || ALL_GENESIS_HASH;
+        } catch {
+          accountInfo.currentGenesisHash = ALL_GENESIS_HASH;
+        }
       } else {
         accountInfo.currentGenesisHash = accountInfo.allGenesisHash || ALL_GENESIS_HASH;
       }
@@ -817,18 +828,15 @@ export default class KoniExtension {
     });
   }
   updateCurrentAccountAddress(address) {
-    this._saveCurrentAccountAddress(address, () => {
-      this.triggerAccountsSubscription();
-    });
+    this._saveCurrentAccountAddress(address);
     return true;
   }
-  saveCurrentAccountAddress(data, id, port) {
-    const cb = createSubscription(id, port);
-    this._saveCurrentAccountAddress(data.address, cb);
-    port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
+  async saveCurrentAccountAddress(data) {
+    return new Promise(resolve => {
+      this._saveCurrentAccountAddress(data.address, currentInfo => {
+        resolve(currentInfo);
+      });
     });
-    return true;
   }
   async getAssetSetting() {
     return this.#koniState.chainService.getAssetSettings();
@@ -845,6 +853,7 @@ export default class KoniExtension {
   async updateAssetSetting(params) {
     try {
       await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting);
+      this.#koniState.eventService.emit('asset.updateState', params.tokenSlug);
       return true;
     } catch (e) {
       console.error('Error updating asset setting', e);
@@ -1322,7 +1331,6 @@ export default class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    let edAsWarning = false;
     if (isEthereumAddress(from) && isEthereumAddress(to)) {
       chainType = ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
@@ -1332,7 +1340,6 @@ export default class KoniExtension {
         [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
       } else {
         [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, to, txVal, !!transferAll, evmApiMap);
-        edAsWarning = true;
       }
     } else {
       const substrateApi = this.#koniState.getSubstrateApi(networkKey);
@@ -1345,7 +1352,6 @@ export default class KoniExtension {
         to: to,
         substrateApi
       });
-      edAsWarning = true;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     return this.#koniState.transactionService.handleTransaction({
@@ -1360,7 +1366,7 @@ export default class KoniExtension {
       extrinsicType: isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
       isTransferAll: transferAll,
-      edAsWarning: edAsWarning
+      edAsWarning: isTransferNativeToken
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -2038,6 +2044,7 @@ export default class KoniExtension {
   }
   async getNominationPoolOptions(chain) {
     const substrateApi = this.#koniState.getSubstrateApi(chain);
+    console.log('chain', chain);
     return await getNominationPoolsInfo(chain, substrateApi);
   }
   async submitBonding(inputData) {
@@ -2048,12 +2055,15 @@ export default class KoniExtension {
       nominatorMetadata,
       selectedValidators
     } = inputData;
-    if (!amount || !selectedValidators) {
-      // Todo: Check and return error here
-
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INVALID_PARAMS)]);
-    }
     const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = validateBondingCondition(chainInfo, amount, selectedValidators, address, chainStakingMetadata, nominatorMetadata);
+    if (!amount || !selectedValidators || bondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(bondingValidation);
+    }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getBondingExtrinsic(chainInfo, amount, selectedValidators, substrateApi, address, nominatorMetadata);
     console.log('Bonding extrinsic: ', chain, extrinsic.toHex());
@@ -2064,7 +2074,8 @@ export default class KoniExtension {
       data: inputData,
       extrinsicType: ExtrinsicType.STAKING_BOND,
       transaction: extrinsic,
-      url: EXTENSION_REQUEST_URL
+      url: EXTENSION_REQUEST_URL,
+      transferNativeAmount: amount
     });
   }
   async submitUnbonding(inputData) {
@@ -2074,12 +2085,17 @@ export default class KoniExtension {
       nominatorMetadata,
       validatorAddress
     } = inputData;
-    if (!amount || !nominatorMetadata) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INVALID_PARAMS)]);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = validateUnbondingCondition(nominatorMetadata, amount, chain, chainStakingMetadata, validatorAddress);
+    if (!amount || unbondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(unbondingValidation);
     }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getUnbondingExtrinsic(nominatorMetadata, amount, chain, substrateApi, validatorAddress);
-    console.log('unbonding extrinsic: ', extrinsic.toHex());
+    console.log('Unbonding extrinsic: ', extrinsic.toHex());
     return await this.#koniState.transactionService.handleTransaction({
       address: nominatorMetadata.address,
       chain: chain,
@@ -2153,7 +2169,7 @@ export default class KoniExtension {
       chainType: ChainType.SUBSTRATE
     });
   }
-  async submitPoolingBonding(inputData) {
+  async submitPoolBonding(inputData) {
     const {
       address,
       amount,
@@ -2161,8 +2177,15 @@ export default class KoniExtension {
       nominatorMetadata,
       selectedPool
     } = inputData;
-
-    // TODO: can't stake when unstake all
+    const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = validatePoolBondingCondition(chainInfo, amount, selectedPool, address, chainStakingMetadata, nominatorMetadata);
+    if (!amount || bondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(bondingValidation);
+    }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getPoolingBondingExtrinsic(substrateApi, amount, selectedPool.id, nominatorMetadata);
     console.log('Join nomination pool extrinsic', extrinsic.toHex());
@@ -2181,6 +2204,14 @@ export default class KoniExtension {
       chain,
       nominatorMetadata
     } = inputData;
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = validateRelayUnbondingCondition(amount, chainStakingMetadata, nominatorMetadata);
+    if (!amount || unbondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(unbondingValidation);
+    }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await getPoolingUnbondingExtrinsic(substrateApi, amount, nominatorMetadata);
     console.log('Nomination pool unbond extrinsic', extrinsic.toHex());
@@ -2670,6 +2701,16 @@ export default class KoniExtension {
     });
     return notificationSubject.value;
   }
+  async reloadCron({
+    data
+  }) {
+    if (data === 'nft') {
+      return await this.#koniState.reloadNft();
+    } else if (data === 'staking') {
+      return await this.#koniState.reloadStaking();
+    }
+    return Promise.resolve(false);
+  }
 
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
@@ -2786,10 +2827,8 @@ export default class KoniExtension {
         return this.accountsGetAll(id, port);
       case 'pri(accounts.saveRecent)':
         return this.saveRecentAccountId(request);
-      case 'pri(accounts.triggerSubscription)':
-        return this.triggerAccountsSubscription();
       case 'pri(currentAccount.saveAddress)':
-        return this.saveCurrentAccountAddress(request, id, port);
+        return await this.saveCurrentAccountAddress(request);
       case 'pri(accounts.updateCurrentAddress)':
         return this.updateCurrentAccountAddress(request);
       case 'pri(settings.changeBalancesVisibility)':
@@ -2953,7 +2992,7 @@ export default class KoniExtension {
       case 'pri(staking.submitTuringCancelCompound)':
         return await this.submitTuringCancelStakeCompound(request);
       case 'pri(bonding.nominationPool.submitBonding)':
-        return await this.submitPoolingBonding(request);
+        return await this.submitPoolBonding(request);
       case 'pri(bonding.nominationPool.submitUnbonding)':
         return await this.submitPoolingUnbonding(request);
 
@@ -3002,6 +3041,8 @@ export default class KoniExtension {
       // Notification
       case 'pri(notifications.subscribe)':
         return this.subscribeNotifications(id, port);
+      case 'pri(cron.reload)':
+        return await this.reloadCron(request);
 
       // Default
       default:

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

@@ -31,7 +31,6 @@ export default class KoniState {
     private readonly unsubscriptionMap;
     private readonly accountRefStore;
     private externalRequest;
-    private serviceInfoSubject;
     private balanceMap;
     private balanceSubject;
     private crowdloanMap;
@@ -109,8 +108,8 @@ export default class KoniState {
     subscribeNftCollection(): import("dexie").Observable<NftCollection[]>;
     resetNft(newAddress: string): void;
     updateNftData(network: string, nftData: NftItem, address: string, callback?: (nftData: NftItem) => void): void;
-    removeNfts(chain: string, address: string, collectionId: string, nftIds: string[]): import("dexie").PromiseExtended<number>;
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
+    cleanUpNfts(chain: string, owner: string, collectionId: string, nftIds: string[]): void;
     getNft(): Promise<NftJson | undefined>;
     subscribeNft(): Subject<NftJson>;
     resetStakingReward(): void;
@@ -141,7 +140,7 @@ export default class KoniState {
     private removeInactiveChainBalances;
     getBalance(reset?: boolean): BalanceJson;
     getStoredBalance(address: string): Promise<Record<string, BalanceItem>>;
-    switchAccount(newAddress: string): Promise<void>;
+    handleSwitchAccount(newAddress: string): Promise<void>;
     resetBalanceMap(newAddress: string): Promise<void>;
     resetCrowdloanMap(newAddress: string): Promise<void>;
     resetStaking(newAddress: string): void;
@@ -153,7 +152,6 @@ export default class KoniState {
     setCrowdloanItem(networkKey: string, item: CrowdloanItem): void;
     private updateCrowdloanStore;
     subscribeCrowdloan(): Subject<CrowdloanJson>;
-    getAllPriceIds(): string[];
     getSmartContractNfts(): _ChainAsset[];
     getChainInfoMap(): Record<string, _ChainInfo>;
     getChainStateMap(): Record<string, _ChainState>;
@@ -182,7 +180,6 @@ export default class KoniState {
     disableChain(chainSlug: string): Promise<boolean>;
     enableChain(chainSlug: string, enableTokens?: boolean): Promise<boolean>;
     resetDefaultChains(): boolean;
-    updateNetworkStatus(networkKey: string, status: _ChainConnectionStatus): void;
     getSubstrateApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi>;
     getSubstrateApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi;
     getEvmApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._EvmApi>;
@@ -190,7 +187,6 @@ export default class KoniState {
     getApiMap(): ApiMap;
     refreshSubstrateApi(key: string): boolean;
     refreshWeb3Api(key: string): void;
-    subscribeServiceInfo(): Subject<ServiceInfo>;
     getServiceInfo(): ServiceInfo;
     getExternalRequestMap(): Record<string, ExternalRequestPromise>;
     setExternalRequestMap(id: string, value: ExternalRequestPromise): void;
@@ -219,8 +215,11 @@ export default class KoniState {
     wakeup(): Promise<void>;
     cancelSubscription(id: string): boolean;
     createUnsubscriptionHandle(id: string, unsubscribe: () => void): void;
+    updateChainConnectionStatus(chain: string, status: _ChainConnectionStatus): void;
     autoEnableChains(addresses: string[]): Promise<void>;
     onAccountAdd(): void;
     onAccountRemove(): void;
+    reloadNft(): Promise<boolean>;
+    reloadStaking(): Promise<boolean>;
 }
 export {};

package/koni/background/handlers/State.js

@@ -59,7 +59,6 @@ export default class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new AccountRefStore();
   externalRequest = {};
-  serviceInfoSubject = new Subject();
   balanceMap = {};
   balanceSubject = new Subject();
   crowdloanMap = generateDefaultCrowdloanMap();
@@ -296,7 +295,7 @@ export default class KoniState {
     return addresses;
   }
   async getPooledStakingRecordsByAddress(addresses) {
-    return await this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
+    return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
 
   // TODO: delete later
@@ -354,12 +353,12 @@ export default class KoniState {
     this.dbService.addNft(address, nftData).catch(e => this.logger.warn(e));
     callback && callback(nftData);
   }
-  removeNfts(chain, address, collectionId, nftIds) {
-    return this.dbService.removeNfts(chain, address, collectionId, nftIds);
-  }
   deleteNftCollection(chain, collectionId) {
     return this.dbService.deleteNftCollection(chain, collectionId);
   }
+  cleanUpNfts(chain, owner, collectionId, nftIds) {
+    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds).catch(e => this.logger.warn(e));
+  }
   async getNft() {
     const addresses = this.getDecodedAddresses();
     if (!addresses.length) {
@@ -446,7 +445,7 @@ export default class KoniState {
     if (address === ALL_ACCOUNT_KEY) {
       const pairs = keyring.getAccounts();
       const pair = pairs[0];
-      const pairGenesisHash = pair.meta.genesisHash;
+      const pairGenesisHash = (pair === null || pair === void 0 ? void 0 : pair.meta.genesisHash) || '';
       if (pairs.length > 1 || !pair) {
         result.allGenesisHash = currentGenesisHash || undefined;
       } else {
@@ -656,7 +655,7 @@ export default class KoniState {
     const items = await this.dbService.stores.balance.getBalanceMapByAddress(address);
     return items || {};
   }
-  async switchAccount(newAddress) {
+  async handleSwitchAccount(newAddress) {
     await Promise.all([this.resetBalanceMap(newAddress), this.resetCrowdloanMap(newAddress)]);
   }
   async resetBalanceMap(newAddress) {
@@ -737,9 +736,6 @@ export default class KoniState {
   subscribeCrowdloan() {
     return this.crowdloanSubject;
   }
-  getAllPriceIds() {
-    return this.chainService.getAllPriceIds();
-  }
   getSmartContractNfts() {
     return this.chainService.getSmartContractNfts();
   }
@@ -797,7 +793,9 @@ export default class KoniState {
       await this.chainService.updateAssetSetting(tokenSlug, {
         visible: true
       });
-      this.eventService.emit('asset.update', tokenSlug);
+      this.eventService.emit('asset.updateState', tokenSlug);
+    } else {
+      this.eventService.emit('asset.updateState', tokenSlug);
     }
   }
   deleteCustomAssets(targetTokens) {
@@ -824,6 +822,7 @@ export default class KoniState {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
       });
+      this.eventService.emit('asset.updateState', newNativeTokenSlug);
     }
     return true;
   }
@@ -866,13 +865,6 @@ export default class KoniState {
     const defaultChains = this.getDefaultNetworkKeys();
     return this.chainService.resetChainInfoMap(defaultChains);
   }
-  updateNetworkStatus(networkKey, status) {
-    const chainState = this.chainService.getChainStateByKey(networkKey);
-    if (chainState.connectionStatus === status) {
-      return;
-    }
-    this.chainService.setChainConnectionStatus(networkKey, status);
-  }
   getSubstrateApiMap() {
     return this.chainService.getSubstrateApiMap();
   }
@@ -898,9 +890,6 @@ export default class KoniState {
   refreshWeb3Api(key) {
     this.chainService.refreshEvmApi(key);
   }
-  subscribeServiceInfo() {
-    return this.serviceInfoSubject;
-  }
   getServiceInfo() {
     return {
       chainInfoMap: this.chainService.getChainInfoMap(),
@@ -1339,6 +1328,9 @@ export default class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
+  updateChainConnectionStatus(chain, status) {
+    this.chainService.setChainConnectionStatus(chain, status);
+  }
   async autoEnableChains(addresses) {
     const assetMap = this.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
@@ -1409,4 +1401,10 @@ export default class KoniState {
       stores.staking.removeAllByAddress(address).catch(console.error);
     });
   }
+  async reloadNft() {
+    return await this.cron.reloadNft();
+  }
+  async reloadStaking() {
+    return await this.cron.reloadStaking();
+  }
 }

package/koni/background/handlers/Tabs.js

@@ -255,13 +255,20 @@ export default class KoniTabs {
         if (!web3.currentProvider.connected) {
           console.log(`[Web3] ${slug} is disconnected, trying to connect...`);
           this.#koniState.refreshWeb3Api(slug);
+          let checkingNum = 0;
           const poll = resolve => {
+            checkingNum += 1;
             if (web3.currentProvider.connected) {
               console.log(`Network [${slug}] is connected.`);
               resolve(true);
             } else {
               console.log(`Connecting to network [${slug}]`);
-              setTimeout(() => poll(resolve), 400);
+              if (checkingNum < 10) {
+                setTimeout(() => poll(resolve), 900);
+              } else {
+                console.log(`Max retry, stop checking [${slug}]`);
+                resolve(false);
+              }
             }
           };
           await new Promise(poll);

package/koni/background/subscription.js

@@ -11,6 +11,7 @@ import { getAmplitudeUnclaimedStakingReward } from '@subwallet/extension-base/ko
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainEnabled, _isChainEvmCompatible, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
 import { logger as createLogger } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export class KoniSubscription {
@@ -58,30 +59,28 @@ export class KoniSubscription {
       this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     }
-    if (!this.eventHandler) {
-      const reloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'chain.update', 'chain.enable', 'asset.update', 'asset.enable', 'transaction.done', 'transaction.failed'];
-      this.eventHandler = (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;
-        }
-        this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
-        this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
-      };
-      this.state.eventService.onLazy(this.eventHandler);
-    }
+    this.eventHandler = (events, eventTypes) => {
+      var _serviceInfo$currentA;
+      const serviceInfo = this.state.getServiceInfo();
+      const needReload = eventTypes.some(eventType => COMMON_RELOAD_EVENTS.includes(eventType));
+      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;
+      }
+      this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
+    };
+    this.state.eventService.onLazy(this.eventHandler);
   }
   stop() {
     this.logger.log('Stopping subscription');
     if (this.eventHandler) {
       this.state.eventService.offLazy(this.eventHandler);
+      this.eventHandler = undefined;
     }
     this.stopAllSubscription();
   }
@@ -107,7 +106,7 @@ export class KoniSubscription {
     });
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    this.state.switchAccount(address).then(() => {
+    this.state.handleSwitchAccount(address).then(() => {
       const addresses = this.state.getDecodedAddresses(address);
       if (!addresses.length) {
         return;
@@ -178,9 +177,7 @@ export class KoniSubscription {
     nftHandler.setDotSamaApiMap(substrateApiMap);
     nftHandler.setWeb3ApiMap(evmApiMap);
     nftHandler.setAddresses(addresses);
-    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).then(() => {
-      this.logger.log('nft state updated');
-    }).catch(this.logger.log);
+    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args), (...args) => this.state.cleanUpNfts(...args)).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -197,7 +194,6 @@ export class KoniSubscription {
     });
     const result = await getNominationStakingRewardData(addresses, targetNetworkMap);
     this.state.updateStakingReward(result, 'slowInterval');
-    this.logger.log('Set staking reward state done', result);
   }
   async subscribeStakingRewardFastInterval(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -226,15 +222,21 @@ export class KoniSubscription {
     const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), getAmplitudeUnclaimedStakingReward(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks)]);
     const result = [...poolingStakingRewards, ...amplitudeUnclaimedStakingRewards];
     this.state.updateStakingReward(result, 'fastInterval');
-    this.logger.log('Set staking reward state with fast interval done', result);
   }
   async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
-    await Promise.all(Object.values(chainInfoMap).map(async chainInfo => {
+    const filteredChainInfoMap = {};
+    Object.values(chainInfoMap).forEach(chainInfo => {
       const chainState = chainStateMap[chainInfo.slug];
       if (chainState !== null && chainState !== void 0 && chainState.active && _isChainSupportSubstrateStaking(chainInfo)) {
-        const chainStakingMetadata = await getChainStakingMetadata(chainInfo.slug, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata);
+        filteredChainInfoMap[chainInfo.slug] = chainInfo;
       }
+    });
+    if (Object.values(filteredChainInfoMap).length === 0) {
+      return;
+    }
+    await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
+      const chainStakingMetadata = await getChainStakingMetadata(chainInfo, substrateApiMap[chainInfo.slug]);
+      this.state.updateChainStakingMetadata(chainStakingMetadata);
     }));
   }
   async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
@@ -249,8 +251,7 @@ export class KoniSubscription {
     if (currentAddress === ALL_ACCOUNT_KEY) {
       addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
     }
-    const validAddresses = addresses.filter(address => !isEthereumAddress(address));
-    await Promise.all(validAddresses.map(async address => {
+    await Promise.all(addresses.map(async address => {
       const isEvmAddress = isEthereumAddress(address);
       await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
         if (isEvmAddress && !_isChainEvmCompatible(chainInfo)) {