@subwallet/extension-base 1.0.6-2 → 1.0.7-1

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);
     }
@@ -1343,6 +1341,7 @@ export default class KoniState {
     await this.priceService.stop();
   }
   async wakeup() {
+    await this.eventService.waitChainReady;
     await this.resumeAllNetworks();
     this.cron.start();
     this.subscription.start();

package/koni/background/handlers/Tabs.js

@@ -10,6 +10,7 @@ import RequestBytesSign from '@subwallet/extension-base/background/RequestBytesS
 import RequestExtrinsicSign from '@subwallet/extension-base/background/RequestExtrinsicSign';
 import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS } from '@subwallet/extension-base/constants';
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
+import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
 import { canDerive } from '@subwallet/extension-base/utils';
@@ -365,7 +366,7 @@ export default class KoniTabs {
   async addEvmToken(id, url, {
     params
   }) {
-    var _input$type, _input$options, _input$options2;
+    var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     const input = params;
     const _tokenType = (input === null || input === void 0 ? void 0 : (_input$type = input.type) === null || _input$type === void 0 ? void 0 : _input$type.toLowerCase()) || '';
     if (_tokenType !== 'erc20' && _tokenType !== 'erc721') {
@@ -380,28 +381,42 @@ export default class KoniTabs {
       throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current chain is not available');
     }
     const tokenType = _tokenType === 'erc20' ? _AssetType.ERC20 : _AssetType.ERC721;
-    const validate = await this.#koniState.validateCustomAsset({
+    const tokenInfo = {
+      slug: '',
+      type: tokenType,
+      name: (input === null || input === void 0 ? void 0 : (_input$options3 = input.options) === null || _input$options3 === void 0 ? void 0 : _input$options3.symbol) || '',
+      contractAddress: input.options.address,
+      symbol: (input === null || input === void 0 ? void 0 : (_input$options4 = input.options) === null || _input$options4 === void 0 ? void 0 : _input$options4.symbol) || '',
+      decimals: (input === null || input === void 0 ? void 0 : (_input$options5 = input.options) === null || _input$options5 === void 0 ? void 0 : _input$options5.decimals) || 0,
+      originChain: chain,
+      contractError: false,
+      validated: false
+    };
+    this.#koniState.validateCustomAsset({
       type: tokenType,
       contractAddress: input.options.address,
       originChain: chain
+    }).then(validate => {
+      if (validate.contractError) {
+        tokenInfo.contractError = true;
+      } else {
+        tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
+        tokenInfo.name = validate.name;
+        tokenInfo.symbol = validate.symbol;
+        tokenInfo.decimals = validate.decimals;
+      }
+    }).catch(() => {
+      tokenInfo.contractError = true;
+    }).finally(() => {
+      tokenInfo.validated = true;
+      this.#koniState.requestService.updateConfirmation(id, 'addTokenRequest', tokenInfo);
     });
 
     // Below code is comment because we will handle exited token in the ui-view
     // if (validate.isExist) {
     //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
     // } else
-    if (validate.contractError) {
-      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
-    }
-    const tokenInfo = {
-      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
-      type: tokenType,
-      name: validate.name,
-      contractAddress: input.options.address,
-      symbol: validate.symbol,
-      decimals: validate.decimals,
-      originChain: chain
-    };
+
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
   async addEvmChain(id, url, {
@@ -413,6 +428,10 @@ export default class KoniTabs {
         blockExplorerUrls,
         chainId,
         chainName,
+        nativeCurrency: {
+          decimals,
+          symbol
+        },
         rpcUrls
       } = input[0];
       if (chainId) {
@@ -463,12 +482,19 @@ export default class KoniTabs {
             throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Currently HTTP provider for EVM network');
           }
           const provider = filteredUrls[0];
-          const chainInfo = await this.#koniState.validateCustomChain(provider);
-          if (!chainInfo.success) {
-            throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
-          }
+          const chainInfo = {
+            existentialDeposit: '0',
+            genesisHash: '',
+            success: true,
+            addressPrefix: '',
+            evmChainId: chainIdNum,
+            decimals: decimals,
+            symbol: symbol,
+            paraId: null,
+            name: chainName
+          };
           const newProviderKey = _generateCustomProviderKey(0);
-          return await this.#koniState.addNetworkConfirm(id, url, {
+          const networkData = {
             mode: 'insert',
             chainSpec: {
               evmChainId: chainInfo.evmChainId,
@@ -488,8 +514,31 @@ export default class KoniTabs {
               symbol: chainInfo.symbol,
               chainType: 'EVM',
               name: chainInfo.name
+            },
+            unconfirmed: true
+          };
+          this.#koniState.validateCustomChain(provider).then(res => {
+            if (!res.success) {
+              networkData.providerError = res.error;
+            } else {
+              networkData.chainSpec = {
+                evmChainId: res.evmChainId,
+                decimals: res.decimals,
+                existentialDeposit: res.existentialDeposit,
+                genesisHash: res.genesisHash,
+                paraId: res.paraId,
+                addressPrefix: res.addressPrefix ? parseInt(res.addressPrefix) : 0
+              };
+              networkData.chainEditInfo.symbol = res.symbol;
+              networkData.chainEditInfo.name = res.name;
             }
+          }).catch(() => {
+            networkData.providerError = _CHAIN_VALIDATION_ERROR.NONE;
+          }).finally(() => {
+            networkData.unconfirmed = false;
+            this.#koniState.requestService.updateConfirmation(id, 'addNetworkRequest', networkData);
           });
+          return await this.#koniState.addNetworkConfirm(id, url, networkData);
         } else {
           throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }

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.6-2",
+  "version": "1.0.7-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1697,11 +1697,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.1.8",
-    "@subwallet/extension-base": "^1.0.6-2",
-    "@subwallet/extension-chains": "^1.0.6-2",
-    "@subwallet/extension-dapp": "^1.0.6-2",
-    "@subwallet/extension-inject": "^1.0.6-2",
+    "@subwallet/chain-list": "^0.1.9",
+    "@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.6-2'
+  version: '1.0.7-1'
 };

package/services/chain-service/types.d.ts

@@ -1,4 +1,5 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import Web3 from 'web3';
 import { ApiPromise } from '@polkadot/api';
 import { SubmittableExtrinsicFunction } from '@polkadot/api/promise/types';
@@ -88,6 +89,8 @@ export declare type _NetworkUpsertParams = {
         existentialDeposit: string;
         decimals: number;
     };
+    unconfirmed?: boolean;
+    providerError?: _CHAIN_VALIDATION_ERROR;
 };
 export declare const _CUSTOM_PREFIX = "custom-";
 export interface _ValidateCustomAssetRequest {

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/migration-service/index.js

@@ -11,8 +11,8 @@ export default class MigrationService {
   async run() {
     const keys = Object.keys(MigrationScripts).sort((a, b) => a.localeCompare(b));
 
-    // Await timeout 2s
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    // Await timeout 1s
+    await new Promise(resolve => setTimeout(resolve, 1000));
     for (let i = 0; i < keys.length; i++) {
       try {
         const JobClass = MigrationScripts[keys[i]];

package/services/request-service/handler/EvmRequestHandler.d.ts

@@ -11,6 +11,7 @@ export default class EvmRequestHandler {
     get numEvmRequests(): number;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
+    updateConfirmation<CT extends ConfirmationType>(id: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): void;
     private signMessage;
     configToTransaction(config: TransactionConfig): Transaction;
     private signTransaction;

package/services/request-service/handler/EvmRequestHandler.js

@@ -72,6 +72,27 @@ export default class EvmRequestHandler {
     this.#requestService.updateIconV2();
     return promise;
   }
+  updateConfirmation(id, type, payload, options = {}, validator) {
+    const confirmations = this.confirmationsQueueSubject.getValue();
+    const confirmationType = confirmations[type];
+
+    // Check duplicate request
+    const exists = confirmationType[id];
+    if (!exists) {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Request does not exist');
+    }
+    const payloadJson = JSON.stringify(payload);
+    confirmationType[id] = {
+      ...exists,
+      payload,
+      payloadJson,
+      ...options
+    };
+    if (validator) {
+      this.confirmationsPromiseMap[id].validator = validator;
+    }
+    this.confirmationsQueueSubject.next(confirmations);
+  }
   async signMessage(confirmation) {
     const {
       account,

package/services/request-service/index.d.ts

@@ -51,6 +51,7 @@ export default class RequestService {
     signInternalTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
+    updateConfirmation<CT extends ConfirmationType>(id: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): void;
     get numRequests(): number;
     resetWallet(): void;
 }

package/services/request-service/index.js

@@ -154,6 +154,9 @@ export default class RequestService {
   async completeConfirmation(request) {
     return await this.#evmRequestHandler.completeConfirmation(request);
   }
+  updateConfirmation(id, type, payload, options = {}, validator) {
+    return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
+  }
 
   // General methods
   get numRequests() {