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

package/koni/api/staking/relayChain.js

@@ -1,98 +1,89 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { APIItemState, StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { APIItemState, StakingStatus, StakingType } from '@subwallet/extension-base/background/KoniTypes';
+import { subscribeRelayChainNominatorMetadata, subscribeRelayChainPoolMemberMetadata } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { _getChainNativeTokenBasicInfo } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import { BN } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
-export function getRelayStakingOnChain(substrateApi, useAddresses, chainInfoMap, chain, callback) {
+export function getRelayStakingOnChain(substrateApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback) {
   var _substrateApi$api$que;
   const {
     symbol
   } = _getChainNativeTokenBasicInfo(chainInfoMap[chain]);
-  return (_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.ledger.multi(useAddresses, ledgers => {
-    let unit = '';
+  return (_substrateApi$api$que = substrateApi.api.query.staking) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.ledger.multi(useAddresses, async ledgers => {
     if (ledgers) {
-      for (let i = 0; i < ledgers.length; i++) {
-        const ledger = ledgers[i];
-        const owner = reformatAddress(useAddresses[i], 42) || undefined;
-        const data = ledger.toHuman();
-        if (data && data.active) {
-          const _totalBalance = data.total;
-          const _activeBalance = data.active;
-          let bnUnlockingBalance = new BN(0);
-          data.unlocking.forEach(({
-            value
-          }) => {
-            value = value.split(' ')[0];
-            const _unlockingBalance = value.replaceAll(',', '');
-            bnUnlockingBalance = bnUnlockingBalance.add(new BN(_unlockingBalance));
-          });
-          let amount = _totalBalance ? _totalBalance.split(' ')[0] : '';
-          amount = amount.replaceAll(',', '');
-          unit = _totalBalance ? _totalBalance.split(' ')[1] : '';
-          const bnTotalBalance = new BN(amount);
-          amount = _activeBalance ? _activeBalance.split(' ')[0] : '';
-          amount = amount.replaceAll(',', '');
-          unit = _activeBalance ? _activeBalance.split(' ')[1] : '';
-          const bnActiveBalance = new BN(amount);
-          const stakingItem = {
+      await Promise.all(ledgers.map(async (_ledger, i) => {
+        const owner = reformatAddress(useAddresses[i], 42);
+        const ledger = _ledger.toPrimitive();
+        if (ledger) {
+          const _totalBalance = ledger.total.toString();
+          const _activeBalance = ledger.active.toString();
+          const bnUnlockingBalance = new BN(_totalBalance).sub(new BN(_activeBalance));
+          stakingCallback(chain, {
             name: chainInfoMap[chain].name,
             chain: chain,
-            balance: bnTotalBalance.toString(),
-            activeBalance: bnActiveBalance.toString(),
+            balance: _totalBalance,
+            activeBalance: _activeBalance,
             unlockingBalance: bnUnlockingBalance.toString(),
             nativeToken: symbol,
-            unit: unit || symbol,
+            unit: symbol,
             state: APIItemState.READY,
             type: StakingType.NOMINATED,
             address: owner
-          };
-          callback(chain, stakingItem);
+          });
+          const nominatorMetadata = await subscribeRelayChainNominatorMetadata(chainInfoMap[chain], owner, substrateApi, ledger);
+          nominatorStateCallback(nominatorMetadata);
         } else {
-          const stakingItem = {
+          stakingCallback(chain, {
             name: chainInfoMap[chain].name,
             chain: chain,
             balance: '0',
             activeBalance: '0',
             unlockingBalance: '0',
             nativeToken: symbol,
-            unit: unit || symbol,
+            unit: symbol,
             state: APIItemState.READY,
             type: StakingType.NOMINATED,
             address: owner
-          };
-          callback(chain, stakingItem);
+          });
+          nominatorStateCallback({
+            chain,
+            type: StakingType.NOMINATED,
+            status: StakingStatus.NOT_STAKING,
+            address: owner,
+            activeStake: '0',
+            nominations: [],
+            unstakings: []
+          });
         }
-      }
+      }));
     }
   });
 }
-export function getRelayPoolingOnChain(parentApi, useAddresses, networks, chain, callback) {
-  var _parentApi$api$query, _parentApi$api$query$;
+export function getRelayPoolingOnChain(substrateApi, useAddresses, chainInfoMap, chain, stakingCallback, nominatorStateCallback) {
+  var _substrateApi$api$que2, _substrateApi$api$que3;
   const {
     symbol
-  } = _getChainNativeTokenBasicInfo(networks[chain]);
-  return (_parentApi$api$query = parentApi.api.query) === null || _parentApi$api$query === void 0 ? void 0 : (_parentApi$api$query$ = _parentApi$api$query.nominationPools) === null || _parentApi$api$query$ === void 0 ? void 0 : _parentApi$api$query$.poolMembers.multi(useAddresses, ledgers => {
+  } = _getChainNativeTokenBasicInfo(chainInfoMap[chain]);
+  return (_substrateApi$api$que2 = substrateApi.api.query) === null || _substrateApi$api$que2 === void 0 ? void 0 : (_substrateApi$api$que3 = _substrateApi$api$que2.nominationPools) === null || _substrateApi$api$que3 === void 0 ? void 0 : _substrateApi$api$que3.poolMembers.multi(useAddresses, async ledgers => {
     if (ledgers) {
-      for (let i = 0; i < ledgers.length; i++) {
-        const ledger = ledgers[i];
+      await Promise.all(ledgers.map(async (_poolMemberInfo, i) => {
+        const poolMemberInfo = _poolMemberInfo.toPrimitive();
         const owner = reformatAddress(useAddresses[i], 42);
-        const data = ledger.toHuman();
-        if (data !== null) {
-          const bondedBalance = data.points;
-          const unbondedBalance = data.unbondingEras;
+        if (poolMemberInfo) {
+          const bondedBalance = poolMemberInfo.points;
+          const unbondedBalance = poolMemberInfo.unbondingEras;
           let unlockingBalance = new BN(0);
-          let totalBalance = new BN(0);
-          Object.entries(unbondedBalance).forEach(([era, value]) => {
-            const bnUnbondedBalance = new BN(value.replaceAll(',', ''));
+          const bnBondedBalance = new BN(bondedBalance.toString());
+          Object.entries(unbondedBalance).forEach(([, value]) => {
+            const bnUnbondedBalance = new BN(value.toString());
             unlockingBalance = unlockingBalance.add(bnUnbondedBalance);
           });
-          const bnBondedBalance = new BN(bondedBalance.replaceAll(',', ''));
-          totalBalance = totalBalance.add(bnBondedBalance).add(unlockingBalance);
-          const stakingItem = {
-            name: networks[chain].name,
+          const totalBalance = bnBondedBalance.add(unlockingBalance);
+          stakingCallback(chain, {
+            name: chainInfoMap[chain].name,
             chain: chain,
             balance: totalBalance.toString(),
             activeBalance: bnBondedBalance.toString(),
@@ -102,11 +93,12 @@ export function getRelayPoolingOnChain(parentApi, useAddresses, networks, chain,
             state: APIItemState.READY,
             type: StakingType.POOLED,
             address: owner
-          };
-          callback(chain, stakingItem);
+          });
+          const nominatorMetadata = await subscribeRelayChainPoolMemberMetadata(chainInfoMap[chain], owner, substrateApi, poolMemberInfo);
+          nominatorStateCallback(nominatorMetadata);
         } else {
-          const stakingItem = {
-            name: networks[chain].name,
+          stakingCallback(chain, {
+            name: chainInfoMap[chain].name,
             chain: chain,
             balance: '0',
             activeBalance: '0',
@@ -116,14 +108,23 @@ export function getRelayPoolingOnChain(parentApi, useAddresses, networks, chain,
             state: APIItemState.READY,
             type: StakingType.POOLED,
             address: owner
-          };
-          callback(chain, stakingItem);
+          });
+          nominatorStateCallback({
+            chain,
+            type: StakingType.POOLED,
+            address: owner,
+            status: StakingStatus.NOT_STAKING,
+            activeStake: '0',
+            nominations: [],
+            // can only join 1 pool at a time
+            unstakings: []
+          });
         }
-      }
+      }));
     }
   });
 }
-export async function getNominationPoolReward(addresses, chainInfoMap, substrateApiMap) {
+export async function getNominationPoolReward(addresses, chainInfoMap, substrateApiMap, callBack) {
   const targetNetworks = [];
   const validAddresses = [];
   Object.keys(chainInfoMap).forEach(key => {
@@ -134,7 +135,6 @@ export async function getNominationPoolReward(addresses, chainInfoMap, substrate
       validAddresses.push(address);
     }
   });
-  const rewardList = [];
   try {
     await Promise.all(targetNetworks.map(async networkKey => {
       const substrateApi = await substrateApiMap[networkKey].isReady;
@@ -143,7 +143,7 @@ export async function getNominationPoolReward(addresses, chainInfoMap, substrate
           var _substrateApi$api$cal, _substrateApi$api$cal2;
           const _unclaimedReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.nominationPoolsApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.pendingRewards(address));
           if (_unclaimedReward) {
-            rewardList.push({
+            callBack({
               address: address,
               chain: networkKey,
               unclaimedReward: _unclaimedReward.toString(),
@@ -156,7 +156,6 @@ export async function getNominationPoolReward(addresses, chainInfoMap, substrate
       }
     }));
   } catch (e) {
-    return rewardList;
+    console.debug(e);
   }
-  return rewardList;
 }

package/koni/api/staking/subsquidStaking.d.ts

@@ -1,3 +1,3 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { StakingRewardItem } from '@subwallet/extension-base/background/KoniTypes';
-export declare const getAllSubsquidStaking: (accounts: string[], chainInfoMap: Record<string, _ChainInfo>) => Promise<StakingRewardItem[]>;
+export declare const getAllSubsquidStaking: (accounts: string[], chainInfoMap: Record<string, _ChainInfo>, callback: (rewardItem: StakingRewardItem) => void) => Promise<void>;

package/koni/api/staking/subsquidStaking.js

@@ -32,9 +32,8 @@ const getSubsquidQuery = (account, chain) => {
     }
   }`;
 };
-const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
+const getSubsquidStaking = async (accounts, chain, chainInfoMap, callback) => {
   try {
-    const result = [];
     await Promise.all(accounts.map(async account => {
       if (_isChainEvmCompatible(chainInfoMap[chain]) && isEthereumAddress(account) || !_isChainEvmCompatible(chainInfoMap[chain]) && !isEthereumAddress(account)) {
         const parsedAccount = reformatAddress(account, _getChainSubstrateAddressPrefix(chainInfoMap[chain]));
@@ -70,17 +69,15 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
           }
         }
         if (stakingRewardItem.totalReward && parseFloat(stakingRewardItem.totalReward) > 0) {
-          result.push(stakingRewardItem);
+          callback(stakingRewardItem);
         }
       }
     }));
-    return result;
   } catch (e) {
-    return [];
+    console.debug(e);
   }
 };
-export const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
-  let rewardList = [];
+export const getAllSubsquidStaking = async (accounts, chainInfoMap, callback) => {
   const filteredNetworks = [];
   Object.values(chainInfoMap).forEach(network => {
     if (INDEXER_SUPPORTED_STAKING_CHAINS.includes(network.slug)) {
@@ -89,11 +86,9 @@ export const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
   });
   try {
     await Promise.all(filteredNetworks.map(async network => {
-      const rewardItems = await getSubsquidStaking(accounts, network, chainInfoMap);
-      rewardList = rewardList.concat(rewardItems);
+      await getSubsquidStaking(accounts, network, chainInfoMap, callback);
     }));
   } catch (e) {
-    return rewardList;
+    console.debug(e);
   }
-  return rewardList;
 };

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, CRON_GET_API_MAP_STATUS, CRON_REFRESH_CHAIN_NOMINATOR_METADATA, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
+import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, CRON_GET_API_MAP_STATUS, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -49,26 +49,6 @@ export class KoniCron {
       delete this.cronMap[key];
     });
   };
-
-  // init = () => {
-  //   const currentAccountInfo = this.state.keyringService.currentAccount;
-  //
-  //   if (!currentAccountInfo?.address) {
-  //     return;
-  //   }
-  //
-  //   if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
-  //     this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap());
-  //     this.updateApiMapStatus();
-  //     this.refreshStakingReward(currentAccountInfo.address);
-  //     this.refreshStakingRewardFastInterval(currentAccountInfo.address);
-  //     // this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
-  //     this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
-  //   } else {
-  //     this.setStakingRewardReady();
-  //   }
-  // };
-
   start = () => {
     if (this.status === 'running') {
       return;
@@ -109,7 +89,6 @@ export class KoniCron {
       (commonReload || needUpdateStaking || stakingSubmitted) && this.resetStakingReward();
       (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshStakingReward');
       (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshPoolingStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('updateNominatorMetadata');
       needUpdateStaking && this.removeCron('updateChainStakingMetadata');
 
       // Chains
@@ -122,7 +101,6 @@ export class KoniCron {
         chainUpdated && this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
         (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);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
         needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
       } else {
         this.setStakingRewardReady();
@@ -140,7 +118,6 @@ export class KoniCron {
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
-      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
     } else {
       this.setStakingRewardReady();
     }
@@ -235,10 +212,8 @@ export class KoniCron {
     this.resetStakingReward();
     this.removeCron('refreshStakingReward');
     this.removeCron('refreshPoolingStakingReward');
-    this.removeCron('updateNominatorMetadata');
     this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
     this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-    this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
     await waitTimeout(1800);
     return true;
   }

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

@@ -101,7 +101,7 @@ export default class KoniState {
     subscribeNominatorMetadata(): Subject<NominatorMetadata[]>;
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
     setStakingItem(networkKey: string, item: StakingItem): void;
-    updateChainStakingMetadata(item: ChainStakingMetadata): void;
+    updateChainStakingMetadata(item: ChainStakingMetadata, changes?: Record<string, unknown>): void;
     updateStakingNominatorMetadata(item: NominatorMetadata): void;
     setNftCollection(network: string, data: NftCollection, callback?: (data: NftCollection) => void): void;
     getNftCollection(): import("dexie").PromiseExtended<NftCollection[]>;
@@ -113,7 +113,7 @@ export default class KoniState {
     getNft(): Promise<NftJson | undefined>;
     subscribeNft(): Subject<NftJson>;
     resetStakingReward(): void;
-    updateStakingReward(stakingRewardData: StakingRewardItem[], type: 'slowInterval' | 'fastInterval', callback?: (stakingRewardData: StakingRewardJson) => void): void;
+    updateStakingReward(stakingRewardData: StakingRewardItem, callback?: (stakingRewardData: StakingRewardJson) => void): void;
     updateStakingRewardReady(ready: boolean): void;
     getAccountRefMap(callback: (refMap: Record<string, Array<string>>) => void): void;
     addAccountRef(addresses: string[], callback: () => void): void;

package/koni/background/handlers/State.js

@@ -69,8 +69,7 @@ export default class KoniState {
   stakingRewardSubject = new Subject();
   stakingRewardState = {
     ready: false,
-    slowInterval: [],
-    fastInterval: []
+    data: {}
   };
   lazyMap = {};
   ready = false;
@@ -193,18 +192,24 @@ export default class KoniState {
   async init() {
     await this.chainService.init();
     await this.migrationService.run();
-    this.startSubscription();
     this.eventService.emit('chain.ready', true);
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
+    await this.startSubscription();
   }
-  startSubscription() {
+  async startSubscription() {
+    await this.eventService.waitKeyringReady;
     this.dbService.subscribeChainStakingMetadata([], data => {
       this.chainStakingMetadataSubject.next(data);
     });
-    this.dbService.subscribeNominatorMetadata(data => {
-      this.stakingNominatorMetadataSubject.next(data);
+    let unsub;
+    this.keyringService.accountSubject.subscribe(accounts => {
+      // TODO: improve this
+      unsub && unsub.unsubscribe();
+      unsub = this.dbService.subscribeNominatorMetadata(Object.keys(accounts), data => {
+        this.stakingNominatorMetadataSubject.next(data);
+      });
     });
   }
   onReady() {
@@ -296,14 +301,6 @@ export default class KoniState {
   async getPooledStakingRecordsByAddress(addresses) {
     return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
-
-  // TODO: delete later
-  // public async getStoredStaking (address: string) {
-  //   const items = await this.dbService.stores.staking.getDataByAddressAsObject(address);
-  //
-  //   return items || {};
-  // }
-
   subscribeStaking() {
     return this.stakingSubject;
   }
@@ -319,8 +316,8 @@ export default class KoniState {
   setStakingItem(networkKey, item) {
     this.dbService.updateStaking(networkKey, item.address, item).catch(e => this.logger.warn(e));
   }
-  updateChainStakingMetadata(item) {
-    this.dbService.updateChainStakingMetadata(item).catch(e => this.logger.warn(e));
+  updateChainStakingMetadata(item, changes) {
+    this.dbService.updateChainStakingMetadata(item, changes).catch(e => this.logger.warn(e));
   }
   updateStakingNominatorMetadata(item) {
     this.dbService.updateNominatorMetadata(item).catch(e => this.logger.warn(e));
@@ -373,12 +370,13 @@ export default class KoniState {
     return this.nftSubject;
   }
   resetStakingReward() {
-    this.stakingRewardState.slowInterval = [];
+    this.stakingRewardState.data = {};
     this.stakingRewardSubject.next(this.stakingRewardState);
   }
-  updateStakingReward(stakingRewardData, type, callback) {
+  updateStakingReward(stakingRewardData, callback) {
     this.stakingRewardState.ready = true;
-    this.stakingRewardState[type] = stakingRewardData;
+    const key = `${stakingRewardData.chain}___${stakingRewardData.address}___${stakingRewardData.type}`;
+    this.stakingRewardState.data[key] = stakingRewardData;
     if (callback) {
       callback(this.stakingRewardState);
     }

package/koni/background/subscription.d.ts

@@ -3,7 +3,7 @@ import { ChainStakingMetadata } from '@subwallet/extension-base/background/KoniT
 import { _ChainState, _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import KoniState from './handlers/State';
-declare type SubscriptionName = 'balance' | 'crowdloan' | 'stakingOnChain';
+declare type SubscriptionName = 'balance' | 'crowdloan' | 'stakingOnChain' | 'essentialChainStakingMetadata';
 export declare class KoniSubscription {
     private eventHandler?;
     private subscriptionMap;
@@ -20,6 +20,7 @@ export declare class KoniSubscription {
     subscribeBalancesAndCrowdloans(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
     subscribeStakingOnChain(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
     initStakingOnChainSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
+    initEssentialChainStakingMetadataSubscription(substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     initBalanceSubscription(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     initCrowdloanSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     subscribeNft(address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;

package/koni/background/subscription.js

@@ -5,7 +5,7 @@ import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { subscribeBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
 import { subscribeCrowdloan } from '@subwallet/extension-base/koni/api/dotsama/crowdloan';
 import { getNominationStakingRewardData, getPoolingStakingRewardData, stakingOnChainApi } from '@subwallet/extension-base/koni/api/staking';
-import { getChainStakingMetadata, getNominatorMetadata } from '@subwallet/extension-base/koni/api/staking/bonding';
+import { getChainStakingMetadata, getNominatorMetadata, subscribeEssentialChainStakingMetadata } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getRelayChainPoolMemberMetadata } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { getAmplitudeUnclaimedStakingReward } from '@subwallet/extension-base/koni/api/staking/paraChain';
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
@@ -19,7 +19,8 @@ export class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
     balance: undefined,
-    stakingOnChain: undefined
+    stakingOnChain: undefined,
+    essentialChainStakingMetadata: undefined
   };
   constructor(state, dbService) {
     this.dbService = dbService;
@@ -98,11 +99,38 @@ export class KoniSubscription {
       return;
     }
     this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
+    this.updateSubscription('essentialChainStakingMetadata', this.initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime)); // TODO: might not need to re-subscribe on changing account
   }
+
   initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
-    const unsub = stakingOnChainApi(addresses, substrateApiMap, (networkKey, rs) => {
+    const stakingCallback = (networkKey, rs) => {
       this.state.setStakingItem(networkKey, rs);
-    }, this.state.getActiveChainInfoMap());
+    };
+    const nominatorStateCallback = nominatorMetadata => {
+      this.state.updateStakingNominatorMetadata(nominatorMetadata);
+    };
+    const unsub = stakingOnChainApi(addresses, substrateApiMap, this.state.getActiveChainInfoMap(), stakingCallback, nominatorStateCallback);
+    if (onlyRunOnFirstTime) {
+      unsub && unsub();
+      return;
+    }
+    return () => {
+      unsub && unsub();
+    };
+  }
+  initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime) {
+    const unsub = subscribeEssentialChainStakingMetadata(substrateApiMap, this.state.getActiveChainInfoMap(), (networkKey, rs) => {
+      this.state.updateChainStakingMetadata(rs, {
+        era: rs.era,
+        minStake: rs.minStake,
+        maxValidatorPerNominator: rs.maxValidatorPerNominator,
+        // temporary fix for Astar, there's no limit for now
+        maxWithdrawalRequestPerValidator: rs.maxWithdrawalRequestPerValidator,
+        // by default
+        allowCancelUnstaking: rs.allowCancelUnstaking,
+        unstakingPeriod: rs.unstakingPeriod
+      });
+    });
     if (onlyRunOnFirstTime) {
       unsub && unsub();
       return;
@@ -168,8 +196,9 @@ export class KoniSubscription {
         targetNetworkMap[key] = network;
       }
     });
-    const result = await getNominationStakingRewardData(addresses, targetNetworkMap);
-    this.state.updateStakingReward(result, 'slowInterval');
+    await getNominationStakingRewardData(addresses, targetNetworkMap, rewardItem => {
+      this.state.updateStakingReward(rewardItem);
+    });
   }
   async subscribeStakingRewardFastInterval(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -195,9 +224,10 @@ export class KoniSubscription {
     Object.keys(targetChainMap).forEach(key => {
       activeNetworks.push(key);
     });
-    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');
+    const updateState = result => {
+      this.state.updateStakingReward(result);
+    };
+    await Promise.all([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), getAmplitudeUnclaimedStakingReward(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
   async fetchingStakingFromApi() {
     try {
@@ -221,16 +251,31 @@ export class KoniSubscription {
     if (Object.values(filteredChainInfoMap).length === 0) {
       return;
     }
+    const timeout = new Promise(resolve => {
+      const id = setTimeout(() => {
+        clearTimeout(id);
+        resolve(null);
+      }, 3000);
+    });
 
     // Fetch data from helper API
-    const dataFromApi = await this.fetchingStakingFromApi();
+    const _dataFromApi = await Promise.race([this.fetchingStakingFromApi(), timeout]);
+    const dataFromApi = _dataFromApi;
     await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
       // Use fetch API data if available
-      if (dataFromApi[chainInfo.slug]) {
-        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug]);
+      if (dataFromApi && dataFromApi[chainInfo.slug]) {
+        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug], {
+          expectedReturn: dataFromApi[chainInfo.slug].expectedReturn,
+          inflation: dataFromApi[chainInfo.slug].inflation,
+          nominatorCount: dataFromApi[chainInfo.slug].nominatorCount
+        });
       } else {
         const chainStakingMetadata = await getChainStakingMetadata(chainInfo, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata);
+        this.state.updateChainStakingMetadata(chainStakingMetadata, {
+          expectedReturn: chainStakingMetadata.expectedReturn,
+          inflation: chainStakingMetadata.inflation,
+          nominatorCount: chainStakingMetadata.nominatorCount
+        });
       }
     }));
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.7-0",
+  "version": "1.0.7-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1698,10 +1698,10 @@
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "^0.1.9",
-    "@subwallet/extension-base": "^1.0.7-0",
-    "@subwallet/extension-chains": "^1.0.7-0",
-    "@subwallet/extension-dapp": "^1.0.7-0",
-    "@subwallet/extension-inject": "^1.0.7-0",
+    "@subwallet/extension-base": "^1.0.7-1",
+    "@subwallet/extension-chains": "^1.0.7-1",
+    "@subwallet/extension-dapp": "^1.0.7-1",
+    "@subwallet/extension-inject": "^1.0.7-1",
     "@subwallet/keyring": "^0.0.9",
     "@subwallet/ui-keyring": "^0.0.9",
     "@unique-nft/types": "^0.6.0-4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.0.7-0'
+  version: '1.0.7-1'
 };

package/services/chain-service/utils.js

@@ -53,7 +53,12 @@ export function _isPureSubstrateChain(chainInfo) {
 }
 export function _getOriginChainOfAsset(assetSlug) {
   if (assetSlug.startsWith(_CUSTOM_PREFIX)) {
-    return assetSlug.split('-')[1];
+    const arr = assetSlug.split('-').slice(1);
+    if (arr[0] === 'custom') {
+      const end = arr.findIndex(str => Object.values(_AssetType).includes(str));
+      return arr.slice(0, end).join('-');
+    }
+    return arr[0];
   }
   return assetSlug.split('-')[0];
 }

package/services/storage-service/DatabaseService.d.ts

@@ -38,7 +38,7 @@ export default class DatabaseService {
     getPooledStakings(addresses: string[], chainHashes?: string[]): Promise<StakingItem[]>;
     subscribeStaking(addresses: string[], chainList?: string[], callback?: (stakingItems: StakingItem[]) => void): Subscription;
     subscribeChainStakingMetadata(chains: string[], callback: (data: ChainStakingMetadata[]) => void): void;
-    subscribeNominatorMetadata(callback: (data: NominatorMetadata[]) => void): void;
+    subscribeNominatorMetadata(addresses: string[], callback: (data: NominatorMetadata[]) => void): Subscription;
     getHistories(query?: HistoryQuery): Promise<import("@subwallet/extension-base/services/storage-service/databases").ITransactionHistoryItem[]>;
     upsertHistory(histories: TransactionHistoryItem[]): Promise<unknown>;
     updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<unknown>;
@@ -58,7 +58,7 @@ export default class DatabaseService {
     updateAssetStore(item: _ChainAsset): Promise<unknown>;
     getAllAssetStore(): Promise<_ChainAsset[]>;
     removeFromAssetStore(items: string[]): Promise<number>;
-    updateChainStakingMetadata(item: ChainStakingMetadata): Promise<unknown>;
+    updateChainStakingMetadata(item: ChainStakingMetadata, changes?: Record<string, unknown>): Promise<unknown>;
     getChainStakingMetadata(): Promise<ChainStakingMetadata[]>;
     getStakingMetadataByChain(chain: string, type?: StakingType): Promise<ChainStakingMetadata | undefined>;
     updateNominatorMetadata(item: NominatorMetadata): Promise<unknown>;