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

package/koni/background/cron.d.ts

@@ -15,16 +15,15 @@ export declare class KoniCron {
     constructor(state: KoniState, subscriptions: KoniSubscription, dbService: DatabaseService);
     private cronMap;
     private subjectMap;
-    private eventHandler?;
     getCron: (name: string) => any;
     getSubjectMap: (name: string) => any;
     addCron: (name: string, callback: (param?: any) => void, interval: number, runFirst?: boolean) => void;
     addSubscribeCron: <T>(name: string, callback: (subject: Subject<T>) => void, interval: number) => void;
     removeCron: (name: string) => void;
     removeAllCrons: () => void;
+    init: () => void;
     start: () => void;
     stop: () => void;
-    updateApiMapStatus: () => void;
     recoverApiMap: () => void;
     refreshNft: (address: string, apiMap: ApiMap, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>) => () => void;
     resetNft: (newAddress: string) => void;
@@ -35,8 +34,4 @@ export declare class KoniCron {
     checkNetworkAvailable: (serviceInfo: ServiceInfo) => boolean;
     updateChainStakingMetadata: (chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
     updateNominatorMetadata: (address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
-    reloadNft(): Promise<boolean>;
-    reloadStaking(): Promise<boolean>;
-    private needUpdateNft;
-    private needUpdateStaking;
 }

package/koni/background/cron.js

@@ -1,10 +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 { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
-import { waitTimeout } from '@subwallet/extension-base/utils';
+import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, 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 { Subject } from 'rxjs';
 import { logger as createLogger } from '@polkadot/util';
 export class KoniCron {
@@ -50,26 +47,21 @@ 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();
-  //   }
-  // };
-
+  init = () => {
+    const currentAccountInfo = this.state.keyringService.currentAccount;
+    if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && 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.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;
@@ -82,7 +74,6 @@ export class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS);
       this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
       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);
@@ -91,74 +82,46 @@ export class KoniCron {
     } else {
       this.setStakingRewardReady();
     }
-    const commonReloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'asset.updateState'];
-    this.eventHandler = (events, eventTypes) => {
+    const reloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'chain.update', 'chain.enable', 'asset.update', 'asset.enable', 'transaction.done', 'transaction.failed'];
+    this.state.eventService.onLazy((events, eventTypes) => {
       var _serviceInfo$currentA;
       const serviceInfo = this.state.getServiceInfo();
-      const commonReload = eventTypes.some(eventType => commonReloadEvents.includes(eventType));
-      const chainUpdated = eventTypes.includes('chain.updateState');
-      const stakingSubmitted = eventTypes.includes('transaction.submitStaking');
-      const updatedChains = [];
-      if (chainUpdated) {
-        events.forEach(event => {
-          if (event.type === 'chain.updateState') {
-            const updatedData = event.data;
-            updatedChains.push(updatedData[0]);
-          }
-        });
-      }
-      if (!commonReload && !chainUpdated && !stakingSubmitted) {
+      const needReload = eventTypes.some(eT => reloadEvents.includes(eT));
+      if (!needReload) {
         return;
       }
-      this.logger.log('ServiceInfo updated, Cron restarting...', eventTypes);
+      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;
       }
-      const chainInfoMap = serviceInfo.chainInfoMap;
-      const needUpdateNft = this.needUpdateNft(chainInfoMap, updatedChains);
-      const needUpdateStaking = this.needUpdateStaking(chainInfoMap, updatedChains);
-
-      // NFT
-      (commonReload || needUpdateNft) && this.resetNft(address);
-      (commonReload || needUpdateNft) && this.removeCron('refreshNft');
-
-      // Staking
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.resetStakingReward();
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshPoolingStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('updateNominatorMetadata');
-      needUpdateStaking && this.removeCron('updateChainStakingMetadata');
-
-      // Chains
-      chainUpdated && this.removeCron('checkStatusApiMap');
-      chainUpdated && this.removeCron('recoverApiMap');
+      this.resetStakingReward();
+      this.resetNft(address);
+      this.removeCron('refreshNft');
+      this.removeCron('refreshStakingReward');
+      this.removeCron('refreshPoolingStakingReward');
+      this.removeCron('checkStatusApiMap');
+      this.removeCron('recoverApiMap');
+      this.removeCron('updateChainStakingMetadata');
+      this.removeCron('updateNominatorMetadata');
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron job if there's at least 1 active network
-        (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-        chainUpdated && this.addCron('checkStatusApiMap', this.updateApiMapStatus, CRON_GET_API_MAP_STATUS);
-        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);
+        this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
+        this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
+        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('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
+        this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
       } else {
         this.setStakingRewardReady();
       }
-    };
-    this.state.eventService.onLazy(this.eventHandler);
+    });
     this.status = 'running';
   };
   stop = () => {
     if (this.status === 'stopped') {
       return;
     }
-
-    // Unsubscribe events
-    if (this.eventHandler) {
-      this.state.eventService.offLazy(this.eventHandler);
-      this.eventHandler = undefined;
-    }
     if (this.serviceSubscription) {
       this.serviceSubscription.unsubscribe();
       this.serviceSubscription = undefined;
@@ -167,36 +130,6 @@ export class KoniCron {
     this.removeAllCrons();
     this.status = 'stopped';
   };
-  updateApiMapStatus = () => {
-    const apiMap = this.state.getApiMap();
-    const networkMap = this.state.getChainStateMap();
-    for (const [key, substrateApi] of Object.entries(apiMap.substrate)) {
-      let status = _ChainConnectionStatus.CONNECTING;
-      if (substrateApi.isApiConnected) {
-        status = _ChainConnectionStatus.CONNECTED;
-      }
-      if (!networkMap[key].connectionStatus) {
-        this.state.updateChainConnectionStatus(key, status);
-      } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== status) {
-        this.state.updateChainConnectionStatus(key, status);
-      }
-    }
-    for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-      evmApi.api.eth.net.isListening().then(() => {
-        if (!networkMap[key].connectionStatus) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-        } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTED) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-        }
-      }).catch(() => {
-        if (!networkMap[key].connectionStatus) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-        } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTING) {
-          this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-        }
-      });
-    }
-  };
   recoverApiMap = () => {
     var _this$subscriptions;
     const apiMap = this.state.getApiMap();
@@ -217,26 +150,28 @@ export class KoniCron {
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {
-      console.debug('Refresh NFT state');
+      this.logger.log('Refresh Nft state');
       this.subscriptions.subscribeNft(address, apiMap.substrate, apiMap.evm, smartContractNfts, chainInfoMap);
     };
   };
   resetNft = newAddress => {
+    this.logger.log('Reset Nft state');
     this.state.resetNft(newAddress);
   };
   resetStakingReward = () => {
+    this.logger.log('Reset Staking Reward State');
     this.state.resetStakingReward();
   };
   refreshStakingReward = address => {
     return () => {
-      console.debug('Refresh staking reward state');
-      this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
+      this.logger.log('Fetching staking reward data');
+      this.subscriptions.subscribeStakingReward(address).then(() => this.logger.log('Refresh staking reward state')).catch(this.logger.error);
     };
   };
   refreshStakingRewardFastInterval = address => {
     return () => {
-      console.debug('Refresh staking reward data with fast interval');
-      this.subscriptions.subscribeStakingRewardFastInterval(address).catch(this.logger.error);
+      this.logger.log('Fetching staking reward data with fast interval');
+      this.subscriptions.subscribeStakingRewardFastInterval(address).then(() => this.logger.log('Refresh staking reward state with fast interval')).catch(this.logger.error);
     };
   };
   setStakingRewardReady = () => {
@@ -247,52 +182,14 @@ export class KoniCron {
   };
   updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching chain staking metadata');
-      this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
+      this.logger.log('Fetching chain staking metadata');
+      this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).then(() => this.logger.log('Updated chain staking metadata')).catch(this.logger.error);
     };
   };
   updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching nominator data for', address);
-      this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
+      this.logger.log('Fetching nominator data', address);
+      this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).then(() => this.logger.log('Updated nominator data', address)).catch(this.logger.error);
     };
   };
-  async reloadNft() {
-    const address = this.state.keyringService.currentAccount.address;
-    const serviceInfo = this.state.getServiceInfo();
-    console.debug('Hard refresh NFT for', address);
-    this.resetNft(address);
-    this.removeCron('refreshNft');
-    this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-    await waitTimeout(1800);
-    return true;
-  }
-  async reloadStaking() {
-    const address = this.state.keyringService.currentAccount.address;
-    console.debug('Hard refresh staking meta for', address);
-    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;
-  }
-  needUpdateNft(chainInfoMap, updatedChains) {
-    if (updatedChains && updatedChains.length > 0) {
-      return updatedChains.some(updatedChain => {
-        const chainInfo = chainInfoMap[updatedChain];
-        return _isChainSupportNativeNft(chainInfo) || _isChainSupportEvmNft(chainInfo) || _isChainSupportWasmNft(chainInfo);
-      });
-    }
-    return false;
-  }
-  needUpdateStaking(chainInfoMap, updatedChains) {
-    if (updatedChains && updatedChains.length > 0) {
-      return updatedChains.some(updatedChain => _isChainSupportSubstrateStaking(chainInfoMap[updatedChain]));
-    }
-    return false;
-  }
 }

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

@@ -40,6 +40,7 @@ export default class KoniExtension {
     private accountsGetAllWithCurrentAddress;
     private accountsGetAll;
     private saveRecentAccountId;
+    private triggerAccountsSubscription;
     private _getAuthListV2;
     private authorizeSubscribeV2;
     private getAuthListV2;
@@ -153,7 +154,7 @@ export default class KoniExtension {
     private submitStakeWithdrawal;
     private submitStakeClaimReward;
     private submitCancelStakeWithdrawal;
-    private submitPoolBonding;
+    private submitPoolingBonding;
     private submitPoolingUnbonding;
     private parseContractInput;
     private submitTuringStakeCompounding;
@@ -178,6 +179,5 @@ export default class KoniExtension {
     private getTransaction;
     private subscribeTransactions;
     private subscribeNotifications;
-    private reloadCron;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }