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

package/cjs/koni/background/handlers/Extension.js

@@ -430,35 +430,38 @@ class KoniExtension {
   }
   async accountsGetAllWithCurrentAddress(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
-    return await new Promise(resolve => {
-      const subscription = _accounts.accounts.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 === _constants.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) || _constants.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 = _uiKeyring.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 = (0, _subscriptions.createSubscription)(id, port);
@@ -480,11 +483,15 @@ class KoniExtension {
     } = _ref21;
     return _uiKeyring.keyring.saveRecent(accountId);
   }
-  triggerAccountsSubscription() {
-    const accountsSubject = _accounts.accounts.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 => {
@@ -840,8 +847,12 @@ class KoniExtension {
     } else {
       accountInfo.address = address;
       if (address !== _constants.ALL_ACCOUNT_KEY) {
-        const currentKeyPair = _uiKeyring.keyring.getAccount(address);
-        accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || _constants.ALL_GENESIS_HASH;
+        try {
+          const currentKeyPair = _uiKeyring.keyring.getPair(address);
+          accountInfo.currentGenesisHash = (currentKeyPair === null || currentKeyPair === void 0 ? void 0 : currentKeyPair.meta.genesisHash) || _constants.ALL_GENESIS_HASH;
+        } catch {
+          accountInfo.currentGenesisHash = _constants.ALL_GENESIS_HASH;
+        }
       } else {
         accountInfo.currentGenesisHash = accountInfo.allGenesisHash || _constants.ALL_GENESIS_HASH;
       }
@@ -851,18 +862,15 @@ class KoniExtension {
     });
   }
   updateCurrentAccountAddress(address) {
-    this._saveCurrentAccountAddress(address, () => {
-      this.triggerAccountsSubscription();
-    });
+    this._saveCurrentAccountAddress(address);
     return true;
   }
-  saveCurrentAccountAddress(data, id, port) {
-    const cb = (0, _subscriptions.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();
@@ -879,6 +887,7 @@ 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);
@@ -1366,7 +1375,6 @@ class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    let edAsWarning = false;
     if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to)) {
       chainType = _KoniTypes.ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
@@ -1376,7 +1384,6 @@ class KoniExtension {
         [transaction, transferAmount.value] = await (0, _transfer3.getERC20TransactionObject)((0, _utils._getContractAddressOfToken)(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
       } else {
         [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, to, txVal, !!transferAll, evmApiMap);
-        edAsWarning = true;
       }
     } else {
       const substrateApi = this.#koniState.getSubstrateApi(networkKey);
@@ -1389,7 +1396,6 @@ class KoniExtension {
         to: to,
         substrateApi
       });
-      edAsWarning = true;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     return this.#koniState.transactionService.handleTransaction({
@@ -1404,7 +1410,7 @@ class KoniExtension {
       extrinsicType: isTransferNativeToken ? _KoniTypes.ExtrinsicType.TRANSFER_BALANCE : _KoniTypes.ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
       isTransferAll: transferAll,
-      edAsWarning: edAsWarning
+      edAsWarning: isTransferNativeToken
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -2099,6 +2105,7 @@ class KoniExtension {
   }
   async getNominationPoolOptions(chain) {
     const substrateApi = this.#koniState.getSubstrateApi(chain);
+    console.log('chain', chain);
     return await (0, _bonding.getNominationPoolsInfo)(chain, substrateApi);
   }
   async submitBonding(inputData) {
@@ -2109,12 +2116,15 @@ class KoniExtension {
       nominatorMetadata,
       selectedValidators
     } = inputData;
-    if (!amount || !selectedValidators) {
-      // Todo: Check and return error here
-
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS)]);
-    }
     const chainInfo = this.#koniState.getChainInfo(chain);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = (0, _bonding.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 (0, _bonding.getBondingExtrinsic)(chainInfo, amount, selectedValidators, substrateApi, address, nominatorMetadata);
     console.log('Bonding extrinsic: ', chain, extrinsic.toHex());
@@ -2125,7 +2135,8 @@ class KoniExtension {
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_BOND,
       transaction: extrinsic,
-      url: _constants2.EXTENSION_REQUEST_URL
+      url: _constants2.EXTENSION_REQUEST_URL,
+      transferNativeAmount: amount
     });
   }
   async submitUnbonding(inputData) {
@@ -2135,12 +2146,17 @@ class KoniExtension {
       nominatorMetadata,
       validatorAddress
     } = inputData;
-    if (!amount || !nominatorMetadata) {
-      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS)]);
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = (0, _bonding.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 (0, _bonding.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,
@@ -2214,7 +2230,7 @@ class KoniExtension {
       chainType: _KoniTypes.ChainType.SUBSTRATE
     });
   }
-  async submitPoolingBonding(inputData) {
+  async submitPoolBonding(inputData) {
     const {
       address,
       amount,
@@ -2222,8 +2238,15 @@ 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, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const bondingValidation = (0, _relayChain.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 (0, _relayChain.getPoolingBondingExtrinsic)(substrateApi, amount, selectedPool.id, nominatorMetadata);
     console.log('Join nomination pool extrinsic', extrinsic.toHex());
@@ -2242,6 +2265,14 @@ class KoniExtension {
       chain,
       nominatorMetadata
     } = inputData;
+    const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, _KoniTypes.StakingType.NOMINATED);
+    if (!chainStakingMetadata || !nominatorMetadata) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors([new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR)]);
+    }
+    const unbondingValidation = (0, _relayChain.validateRelayUnbondingCondition)(amount, chainStakingMetadata, nominatorMetadata);
+    if (!amount || unbondingValidation.length > 0) {
+      return this.#koniState.transactionService.generateBeforeHandleResponseErrors(unbondingValidation);
+    }
     const substrateApi = this.#koniState.getSubstrateApi(chain);
     const extrinsic = await (0, _relayChain.getPoolingUnbondingExtrinsic)(substrateApi, amount, nominatorMetadata);
     console.log('Nomination pool unbond extrinsic', extrinsic.toHex());
@@ -2744,6 +2775,17 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
+  async reloadCron(_ref65) {
+    let {
+      data
+    } = _ref65;
+    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
@@ -2860,10 +2902,8 @@ 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)':
@@ -3027,7 +3067,7 @@ 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);
 
@@ -3076,6 +3116,8 @@ class KoniExtension {
       // Notification
       case 'pri(notifications.subscribe)':
         return this.subscribeNotifications(id, port);
+      case 'pri(cron.reload)':
+        return await this.reloadCron(request);
 
       // Default
       default:

package/cjs/koni/background/handlers/State.js

@@ -67,7 +67,6 @@ class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new _AccountRef.default();
   externalRequest = {};
-  serviceInfoSubject = new _rxjs.Subject();
   balanceMap = {};
   balanceSubject = new _rxjs.Subject();
   crowdloanMap = generateDefaultCrowdloanMap();
@@ -309,7 +308,7 @@ 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
@@ -367,12 +366,12 @@ 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) {
@@ -459,7 +458,7 @@ class KoniState {
     if (address === _constants.ALL_ACCOUNT_KEY) {
       const pairs = _uiKeyring.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 {
@@ -673,7 +672,7 @@ 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) {
@@ -754,9 +753,6 @@ class KoniState {
   subscribeCrowdloan() {
     return this.crowdloanSubject;
   }
-  getAllPriceIds() {
-    return this.chainService.getAllPriceIds();
-  }
   getSmartContractNfts() {
     return this.chainService.getSmartContractNfts();
   }
@@ -814,7 +810,9 @@ 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) {
@@ -841,6 +839,7 @@ class KoniState {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
       });
+      this.eventService.emit('asset.updateState', newNativeTokenSlug);
     }
     return true;
   }
@@ -884,13 +883,6 @@ 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();
   }
@@ -916,9 +908,6 @@ class KoniState {
   refreshWeb3Api(key) {
     this.chainService.refreshEvmApi(key);
   }
-  subscribeServiceInfo() {
-    return this.serviceInfoSubject;
-  }
   getServiceInfo() {
     return {
       chainInfoMap: this.chainService.getChainInfoMap(),
@@ -1368,6 +1357,9 @@ 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 => {
@@ -1439,5 +1431,11 @@ class KoniState {
       stores.staking.removeAllByAddress(address).catch(console.error);
     });
   }
+  async reloadNft() {
+    return await this.cron.reloadNft();
+  }
+  async reloadStaking() {
+    return await this.cron.reloadStaking();
+  }
 }
 exports.default = KoniState;

package/cjs/koni/background/handlers/Tabs.js

@@ -295,13 +295,20 @@ 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/cjs/koni/background/subscription.js

@@ -14,6 +14,7 @@ var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain")
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
 var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
+var _types = require("@subwallet/extension-base/services/event-service/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -64,30 +65,28 @@ 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 => _types.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();
   }
@@ -113,7 +112,7 @@ 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;
@@ -189,8 +188,8 @@ class KoniSubscription {
       return _this.state.updateNftData(...arguments);
     }, function () {
       return _this.state.setNftCollection(...arguments);
-    }).then(() => {
-      this.logger.log('nft state updated');
+    }, function () {
+      return _this.state.cleanUpNfts(...arguments);
     }).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
@@ -209,7 +208,6 @@ class KoniSubscription {
     });
     const result = await (0, _staking.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);
@@ -239,15 +237,21 @@ class KoniSubscription {
     const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), (0, _paraChain.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 && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        const chainStakingMetadata = await (0, _bonding.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 (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
+      this.state.updateChainStakingMetadata(chainStakingMetadata);
     }));
   }
   async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
@@ -262,8 +266,7 @@ class KoniSubscription {
     if (currentAddress === _constants.ALL_ACCOUNT_KEY) {
       addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
     }
-    const validAddresses = addresses.filter(address => !(0, _utilCrypto.isEthereumAddress)(address));
-    await Promise.all(validAddresses.map(async address => {
+    await Promise.all(addresses.map(async address => {
       const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(address);
       await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
         if (isEvmAddress && !(0, _utils._isChainEvmCompatible)(chainInfo)) {

package/cjs/services/chain-service/handler/SubstrateChainHandler.js

@@ -7,6 +7,7 @@ exports.SubstrateChainHandler = exports.DEFAULT_AUX = void 0;
 var _api = require("@acala-network/api");
 var _types = require("@oak-foundation/types");
 var _types2 = require("@subwallet/chain-list/types");
+var _utils = require("@subwallet/extension-base/koni/api/tokens/wasm/utils");
 var _lightClient = require("@subwallet/extension-base/services/chain-service/handler/light-client");
 var _api2 = require("@polkadot/api");
 var _apiContract = require("@polkadot/api-contract");
@@ -94,13 +95,13 @@ class SubstrateChainHandler {
       if (tokenType === _types2._AssetType.PSP22) {
         tokenContract = new _apiContract.ContractPromise(substrateApi.api, _helper._PSP22_ABI, contractAddress);
         const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         }),
         // read-only operation so no gas limit
         tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         })]);
         if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
           this.logger.error('Error response while validating WASM contract');
@@ -111,18 +112,22 @@ class SubstrateChainHandler {
             contractError: true
           };
         } else {
-          var _symbolResp$output, _decimalsResp$output, _symbolResp$output2;
-          name = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
-          decimals = parseInt((_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman());
-          symbol = (_symbolResp$output2 = symbolResp.output) === null || _symbolResp$output2 === void 0 ? void 0 : _symbolResp$output2.toHuman();
+          var _symbolResp$output, _decimalsResp$output, _nameResp$output;
+          const symbolObj = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
+          const decimalsObj = (_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman();
+          const nameObj = (_nameResp$output = nameResp.output) === null || _nameResp$output === void 0 ? void 0 : _nameResp$output.toHuman();
+          name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+          decimals = decimalsResp.output ? new _util.BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+          symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
           if (name === '' || symbol === '') {
             contractError = true;
           }
+          console.log('validate PSP22', name, symbol, decimals);
         }
       } else {
         tokenContract = new _apiContract.ContractPromise(substrateApi.api, _helper._PSP34_ABI, contractAddress);
         const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: (0, _utils.getDefaultWeightV2)(substrateApi.api)
         }); // read-only operation so no gas limit
 
         if (!collectionIdResp.result.isOk || !collectionIdResp.output) {

package/cjs/services/chain-service/handler/light-client/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ProviderPlaceholder = void 0;
 exports.getSubstrateConnectProvider = getSubstrateConnectProvider;
 exports.relayChainSpecs = exports.paraChainSpecs = void 0;
 var _rpcProvider = require("@polkadot/rpc-provider");
@@ -103,6 +104,7 @@ class ProviderPlaceholder {
     });
   }
 }
+exports.ProviderPlaceholder = ProviderPlaceholder;
 function getSubstrateConnectProvider(specLink) {
   const [relayName, paraName] = specLink.split('/');
   const relaySpec = relayChainSpecs[relayName];