@subwallet/extension-base 1.1.6-0 → 1.1.6-2

package/background/KoniTypes.d.ts

@@ -320,6 +320,7 @@ export interface UiSettings {
     camera: boolean;
     timeAutoLock: number;
     enableChainPatrol: boolean;
+    walletReference: string;
 }
 export declare type RequestSettingsType = UiSettings;
 export declare type RequestCameraSettings = {
@@ -1532,6 +1533,7 @@ export interface KoniRequestSignatures {
     'pri(chainService.upsertChain)': [_NetworkUpsertParams, boolean];
     'pri(chainService.enableChains)': [EnableMultiChainParams, boolean];
     'pri(chainService.enableChain)': [EnableChainParams, boolean];
+    'pri(chainService.reconnectChain)': [string, boolean];
     'pri(chainService.disableChains)': [string[], boolean];
     'pri(chainService.disableChain)': [string, boolean];
     'pri(chainService.removeChain)': [string, boolean];

package/cjs/koni/api/nft/config.js

@@ -53,7 +53,7 @@ const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 exports.IPFS_GATEWAY_4EVERLAND = IPFS_GATEWAY_4EVERLAND;
 const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
 exports.IPFS_FLEEK = IPFS_FLEEK;
-const IPFS_HARDBIN = 'https://hardbin.com/ipfs';
+const IPFS_HARDBIN = 'https://hardbin.com/ipfs/';
 exports.IPFS_HARDBIN = IPFS_HARDBIN;
 let SUPPORTED_NFT_NETWORKS;
 exports.SUPPORTED_NFT_NETWORKS = SUPPORTED_NFT_NETWORKS;

package/cjs/koni/api/staking/bonding/amplitude.js

@@ -213,23 +213,24 @@ async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
   const allCollators = [];
   for (const _collator of _allCollators) {
-    const collatorInfo = _collator[1].toHuman();
-    if (typeof collatorInfo.status === 'string' && collatorInfo.status.toLowerCase() === 'active') {
-      allCollators.push({
-        address: collatorInfo.id,
-        totalStake: (0, _utils2.parseRawNumber)(collatorInfo.total).toString(),
-        ownStake: (0, _utils2.parseRawNumber)(collatorInfo.stake).toString(),
-        otherStake: ((0, _utils2.parseRawNumber)(collatorInfo.total) - (0, _utils2.parseRawNumber)(collatorInfo.stake)).toString(),
-        nominatorCount: collatorInfo.delegators.length,
-        commission: 0,
-        expectedReturn: delegatorReturn,
-        blocked: false,
-        isVerified: false,
-        minBond: '0',
-        chain,
-        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-      });
-    }
+    const collatorInfo = _collator[1].toPrimitive();
+    const bnTotalStake = new _util.BN(collatorInfo.total);
+    const bnOwnStake = new _util.BN(collatorInfo.stake);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    allCollators.push({
+      address: collatorInfo.id,
+      totalStake: bnTotalStake.toString(),
+      ownStake: bnOwnStake.toString(),
+      otherStake: bnOtherStake.toString(),
+      nominatorCount: collatorInfo.delegators.length,
+      commission: 0,
+      expectedReturn: delegatorReturn,
+      blocked: false,
+      isVerified: false,
+      minBond: '0',
+      chain,
+      isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+    });
   }
   return allCollators;
 }

package/cjs/koni/api/staking/bonding/paraChain.js

@@ -44,7 +44,7 @@ function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainSta
   const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
   const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new _util.BN(targetNomination.validatorMinStake || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
+  const bnMinStake = _util.BN.max(bnCollatorMinStake, bnChainMinStake);
   if (targetNomination.hasUnstaking) {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
   }
@@ -101,9 +101,10 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
 }
 function subscribeParaChainStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.parachainStaking.round(_round => {
+    var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3;
     const roundObj = _round.toHuman();
     const round = (0, _utils3.parseRawNumber)(roundObj.current);
-    const maxDelegations = substrateApi.api.consts.parachainStaking.maxDelegationsPerDelegator.toString();
+    const maxDelegations = (_substrateApi$api$con = substrateApi.api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.parachainStaking) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.maxDelegationsPerDelegator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
     const unstakingDelay = substrateApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
     const unstakingPeriod = parseInt(unstakingDelay) * (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default);
     callback(chain, {
@@ -332,17 +333,21 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     const _collatorAddress = collator[0].toHuman();
     const collatorAddress = _collatorAddress[0];
     const collatorInfo = collator[1].toPrimitive();
+    const bnTotalStake = new _util.BN(collatorInfo.totalCounted);
+    const bnOwnStake = new _util.BN(collatorInfo.bond);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    const bnMinBond = new _util.BN(collatorInfo.lowestTopDelegationAmount);
     allCollators.push({
       commission: 0,
       expectedReturn: 0,
       address: collatorAddress,
-      totalStake: collatorInfo.totalCounted.toString(),
-      ownStake: collatorInfo.bond.toString(),
-      otherStake: (collatorInfo.totalCounted - collatorInfo.bond).toString(),
+      totalStake: bnTotalStake.toString(),
+      ownStake: bnOwnStake.toString(),
+      otherStake: bnOtherStake.toString(),
       nominatorCount: collatorInfo.delegationCount,
       blocked: false,
       isVerified: false,
-      minBond: collatorInfo.lowestTopDelegationAmount.toString(),
+      minBond: bnMinBond.toString(),
       chain,
       isCrowded: parseInt(maxDelegationPerCollator) > 0
     });
@@ -354,10 +359,6 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     ]);
     const rawInfo = _info.toHuman();
     const rawIdentity = _identity ? _identity.toHuman() : null;
-    const rawBond = rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.bond;
-    const bond = new _util.BN(rawBond.replaceAll(',', ''));
-    const delegationCount = (0, _utils3.parseRawNumber)(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.delegationCount);
-    const minDelegation = (0, _utils3.parseRawNumber)(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.lowestTopDelegationAmount);
     const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
     let isReasonable = false;
     let identity;
@@ -369,21 +370,14 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,
-      bond: bond.toString(),
-      minDelegation: minDelegation.toString(),
-      delegationCount,
       active
     };
   }));
   for (const validator of allCollators) {
-    validator.minBond = extraInfoMap[validator.address].minDelegation.toString();
-    validator.ownStake = extraInfoMap[validator.address].bond.toString();
     validator.blocked = !extraInfoMap[validator.address].active;
     validator.identity = extraInfoMap[validator.address].identity;
     validator.isVerified = extraInfoMap[validator.address].isVerified;
     // @ts-ignore
-    validator.otherStake = (validator.totalStake - validator.ownStake).toString();
-    validator.nominatorCount = extraInfoMap[validator.address].delegationCount;
     validator.commission = collatorCommission;
   }
   return allCollators;

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

@@ -1423,12 +1423,20 @@ class KoniExtension {
   async subscribeHistory(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
-    historySubject.subscribe(cb);
-    this.createUnsubscriptionHandle(id, historySubject.unsubscribe);
+    const subscription = historySubject.subscribe(histories => {
+      const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+
+      // Re-filter
+      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+    });
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return historySubject.getValue();
+    const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+
+    // Re-filter
+    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
   }
 
   // Save address to contact
@@ -1726,6 +1734,9 @@ class KoniExtension {
     } = _ref43;
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
+  async reconnectChain(chainSlug) {
+    return this.#koniState.chainService.reconnectChain(chainSlug);
+  }
   async validateNetwork(_ref44) {
     let {
       existedChainSlug,
@@ -3702,6 +3713,8 @@ class KoniExtension {
         return this.getSupportedSmartContractTypes();
       case 'pri(chainService.enableChain)':
         return await this.enableChain(request);
+      case 'pri(chainService.reconnectChain)':
+        return await this.reconnectChain(request);
       case 'pri(chainService.disableChain)':
         return await this.disableChain(request);
       case 'pri(chainService.removeChain)':

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

@@ -894,11 +894,7 @@ class KoniTabs {
     return true;
   }
   isEvmPublicRequest(type, request) {
-    if (type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method)) {
-      return true;
-    } else {
-      return false;
-    }
+    return type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method);
   }
   async addPspToken(id, url, _ref22) {
     let {

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.6-0'
+  version: '1.1.6-2'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/SubWalleEvmProvider.js

@@ -9,11 +9,11 @@ var _safeEventEmitter = _interopRequireDefault(require("@metamask/safe-event-emi
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+let subscribeFlag = false;
 class SubWalletEvmProvider extends _safeEventEmitter.default {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _subscribed = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -27,7 +27,7 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
     return this._connected;
   }
   subscribeExtensionEvents() {
-    if (this._subscribed) {
+    if (subscribeFlag) {
       return;
     }
     this.sendMessage('evm(events.subscribe)', null, _ref => {
@@ -49,19 +49,33 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
         console.warn('Can not handle event', type, payload);
       }
     }).then(done => {
-      this._subscribed = true;
-    }).catch(console.error);
+      subscribeFlag = true;
+    }).catch(() => {
+      subscribeFlag = false;
+    });
+    subscribeFlag = true;
   }
   async enable() {
     return this.request({
       method: 'eth_requestAccounts'
     });
   }
+  on(eventName, listener) {
+    this.subscribeExtensionEvents();
+    super.on(eventName, listener);
+    return this;
+  }
+  once(eventName, listener) {
+    this.subscribeExtensionEvents();
+    super.once(eventName, listener);
+    return this;
+  }
   request(_ref2) {
     let {
       method,
       params
     } = _ref2;
+    // Subscribe events
     switch (method) {
       case 'eth_requestAccounts':
         return new Promise((resolve, reject) => {
@@ -70,9 +84,6 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            // Subscribe event
-            this.subscribeExtensionEvents();
-
             // Return account list
             this.request({
               method: 'eth_accounts'

package/cjs/services/chain-service/constants.js

@@ -61,13 +61,13 @@ const _NFT_CHAIN_GROUP = {
 // Staking--------------------------------------------------------------------------------------------------------------
 exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
   amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
-  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics
@@ -100,7 +100,9 @@ const _STAKING_ERA_LENGTH_MAP = {
   amplitude_test: 2,
   pendulum: 2,
   kilt: 2,
-  kilt_peregrine: 2
+  kilt_peregrine: 2,
+  edgeware: 6,
+  kate: 6
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {

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

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SHORT_RETRY_TIME = exports.LONG_RETRY_TIME = exports.FIRST_RECONNECT_TIME = exports.AbstractChainHandler = void 0;
+exports.SHORT_RETRY_TIME = exports.FIRST_RECONNECT_TIME = exports.AbstractChainHandler = void 0;
+var _types = require("@subwallet/extension-base/services/chain-service/types");
 var _rxjs = require("rxjs");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const SHORT_RECOVER_RETRY = 3;
+const MAX_RECOVER_RETRY = 6;
 const FIRST_RECONNECT_TIME = 3000;
 exports.FIRST_RECONNECT_TIME = FIRST_RECONNECT_TIME;
-const SHORT_RETRY_TIME = 15000;
+const SHORT_RETRY_TIME = 20000;
+// export const LONG_RETRY_TIME = 60000;
 exports.SHORT_RETRY_TIME = SHORT_RETRY_TIME;
-const LONG_RETRY_TIME = 60000;
-exports.LONG_RETRY_TIME = LONG_RETRY_TIME;
 class AbstractChainHandler {
   apiStateMapSubject = new _rxjs.BehaviorSubject({});
   // Recover retry times
@@ -24,20 +24,26 @@ class AbstractChainHandler {
     this.parent = parent;
     this.recoverMap = {};
   }
-  handleConnect(chain, isConnected) {
+  handleConnection(chain, newStatus) {
+    let forceRecover = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     const currentMap = this.apiStateMapSubject.getValue();
-    const currentStatus = currentMap[chain];
+    const oldStatus = currentMap[chain];
 
     // Update api state
-    if (currentStatus !== isConnected) {
+    if (oldStatus !== newStatus) {
       this.apiStateMapSubject.next({
         ...currentMap,
-        [chain]: isConnected
+        [chain]: newStatus
       });
     }
 
+    // Reset retry when connected is successful
+    if (newStatus === _types._ChainConnectionStatus.CONNECTED) {
+      this.cancelRecover(chain);
+    }
+
     // Handle connection change
-    if (!isConnected) {
+    if ((!this.isRecovering(chain) || forceRecover) && newStatus === _types._ChainConnectionStatus.DISCONNECTED) {
       this.handleRecover(chain);
     }
   }
@@ -57,8 +63,13 @@ class AbstractChainHandler {
     };
     clearTimeout(retryRecord.timeout);
     const retryTimes = retryRecord.retryTimes;
+    if (retryTimes >= MAX_RECOVER_RETRY) {
+      this.handleConnection(chain, _types._ChainConnectionStatus.UNSTABLE);
+      this.cancelRecover(chain); // Need manual recover
+    }
+
     // Slow down recover frequency if increasing recover times
-    const retryTimeout = retryTimes === 0 ? FIRST_RECONNECT_TIME : retryTimes >= SHORT_RECOVER_RETRY ? LONG_RETRY_TIME : SHORT_RETRY_TIME;
+    const retryTimeout = retryTimes === 0 ? FIRST_RECONNECT_TIME : SHORT_RETRY_TIME;
 
     // Recover api after retry timeout
     const timeout = setTimeout(() => {
@@ -77,6 +88,9 @@ class AbstractChainHandler {
       timeout
     };
   }
+  isRecovering(chain) {
+    return !!this.recoverMap[chain];
+  }
   cancelRecover(chain) {
     const retryRecord = this.recoverMap[chain];
     if (retryRecord) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EvmApi = void 0;
 require("@polkadot/types-augment");
+var _types = require("@subwallet/extension-base/services/chain-service/types");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _rxjs = require("rxjs");
 var _web = _interopRequireDefault(require("web3"));
@@ -15,15 +16,23 @@ var _web = _interopRequireDefault(require("web3"));
 class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new _rxjs.BehaviorSubject(false);
+  connectionStatusSubject = new _rxjs.BehaviorSubject(_types._ChainConnectionStatus.DISCONNECTED);
   isApiReady = false;
   isApiReadyOnce = false;
   get isApiConnected() {
     return this.isApiConnectedSubject.getValue();
   }
-  updateConnectedStatus(isConnected) {
+  get connectionStatus() {
+    return this.connectionStatusSubject.getValue();
+  }
+  updateConnectionStatus(status) {
+    const isConnected = status === _types._ChainConnectionStatus.CONNECTED;
     if (isConnected !== this.isApiConnectedSubject.value) {
       this.isApiConnectedSubject.next(isConnected);
     }
+    if (status !== this.connectionStatusSubject.value) {
+      this.connectionStatusSubject.next(status);
+    }
   }
   get isReady() {
     return this.isReadyHandler.promise;
@@ -80,6 +89,7 @@ class EvmApi {
     // For websocket provider, connect it
     const wsProvider = this.provider;
     wsProvider.connect && wsProvider.connect();
+    this.updateConnectionStatus(_types._ChainConnectionStatus.CONNECTING);
     // Check if api is ready
     this.api.eth.net.isListening().then(() => {
       this.isApiReadyOnce = true;
@@ -88,7 +98,7 @@ class EvmApi {
       this.isApiReadyOnce = false;
       this.isApiReady = false;
       this.isReadyHandler.reject(error);
-      this.updateConnectedStatus(false);
+      this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
       console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
     });
 
@@ -102,7 +112,7 @@ class EvmApi {
     // For websocket provider, disconnect it
     const wsProvider = this.provider;
     wsProvider.disconnect && wsProvider.disconnect();
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
     return Promise.resolve();
   }
   destroy() {
@@ -117,10 +127,10 @@ class EvmApi {
         this.isReadyHandler.resolve(this);
       }
     }
-    this.updateConnectedStatus(true);
+    this.updateConnectionStatus(_types._ChainConnectionStatus.CONNECTED);
   }
   onDisconnect() {
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
     if (this.isApiConnected) {
       console.warn(`Disconnected from ${this.chainSlug} of ${this.apiUrl} (EVM)`);
       this.isApiReady = false;

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

@@ -46,8 +46,8 @@ class EvmChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     const apiObject = new _EvmApi2.EvmApi(chainSlug, apiUrl, {
       providerName
     });
-    apiObject.isApiConnectedSubject.subscribe(this.handleConnect.bind(this, chainSlug));
-    apiObject.isApiConnectedSubject.subscribe(onUpdateStatus);
+    apiObject.connectionStatusSubject.subscribe(this.handleConnection.bind(this, chainSlug));
+    apiObject.connectionStatusSubject.subscribe(onUpdateStatus);
     return Promise.resolve(apiObject);
   }
   async recoverApi(chainSlug) {

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

@@ -10,6 +10,7 @@ var _types = require("@oak-foundation/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _lightClient = require("@subwallet/extension-base/services/chain-service/handler/light-client");
 var _SubstrateChainHandler = require("@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler");
+var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _availJsSdk = require("avail-js-sdk");
 var _rxjs = require("rxjs");
@@ -26,13 +27,22 @@ class SubstrateApi {
   isApiReady = false;
   isApiReadyOnce = false;
   isApiConnectedSubject = new _rxjs.BehaviorSubject(false);
+  connectionStatusSubject = new _rxjs.BehaviorSubject(_types2._ChainConnectionStatus.DISCONNECTED);
   get isApiConnected() {
     return this.isApiConnectedSubject.getValue();
   }
-  updateConnectedStatus(isConnected) {
+  substrateRetry = 0;
+  get connectionStatus() {
+    return this.connectionStatusSubject.getValue();
+  }
+  updateConnectionStatus(status) {
+    const isConnected = status === _types2._ChainConnectionStatus.CONNECTED;
     if (isConnected !== this.isApiConnectedSubject.value) {
       this.isApiConnectedSubject.next(isConnected);
     }
+    if (status !== this.connectionStatusSubject.value) {
+      this.connectionStatusSubject.next(status);
+    }
   }
   specName = '';
   specVersion = '';
@@ -60,12 +70,14 @@ class SubstrateApi {
         [`${metadata.genesisHash}-${metadata.specVersion}`]: metadata.hexValue
       };
     }
+    this.updateConnectionStatus(_types2._ChainConnectionStatus.CONNECTING);
+    let api;
     if (_constants._API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
-      return new _api2.ApiPromise((0, _api.options)({
+      api = new _api2.ApiPromise((0, _api.options)({
         provider
       }));
     } else if (_constants._API_OPTIONS_CHAIN_GROUP.turing.includes(this.chainSlug)) {
-      return new _api2.ApiPromise({
+      api = new _api2.ApiPromise({
         provider,
         rpc: _types.rpc,
         types: _types.types
@@ -78,8 +90,13 @@ class SubstrateApi {
         signedExtensions: _availJsSdk.spec.signedExtensions
       });
     } else {
-      return new _api2.ApiPromise(apiOption);
+      api = new _api2.ApiPromise(apiOption);
     }
+    api.on('ready', this.onReady.bind(this));
+    api.on('connected', this.onConnect.bind(this));
+    api.on('disconnected', this.onDisconnect.bind(this));
+    api.on('error', this.onError.bind(this));
+    return api;
   }
   constructor(chainSlug, apiUrl) {
     let {
@@ -95,10 +112,6 @@ class SubstrateApi {
     this.provider = this.createProvider(apiUrl);
     this.api = externalApiPromise || this.createApi(this.provider);
     this.handleApiReady = (0, _promise.createPromiseHandler)();
-    this.api.on('ready', this.onReady.bind(this));
-    this.api.on('connected', this.onConnect.bind(this));
-    this.api.on('disconnected', this.onDisconnect.bind(this));
-    this.api.on('error', this.onError.bind(this));
   }
   get isReady() {
     return this.handleApiReady.promise;
@@ -120,17 +133,16 @@ class SubstrateApi {
     this.apiUrl = apiUrl;
     this.provider = this.createProvider(apiUrl);
     this.api = this.createApi(this.provider);
-    this.api.on('ready', this.onReady.bind(this));
-    this.api.on('connected', this.onConnect.bind(this));
-    this.api.on('disconnected', this.onDisconnect.bind(this));
-    this.api.on('error', this.onError.bind(this));
   }
   connect() {
     if (this.api.isConnected) {
-      this.updateConnectedStatus(true);
+      this.updateConnectionStatus(_types2._ChainConnectionStatus.CONNECTED);
     } else {
+      this.updateConnectionStatus(_types2._ChainConnectionStatus.CONNECTING);
       this.api.connect().then(() => {
-        this.updateConnectedStatus(true);
+        this.api.isReady.then(() => {
+          this.updateConnectionStatus(_types2._ChainConnectionStatus.CONNECTED);
+        }).catch(console.error);
       }).catch(console.error);
     }
   }
@@ -140,7 +152,7 @@ class SubstrateApi {
     } catch (e) {
       console.error(e);
     }
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_types2._ChainConnectionStatus.DISCONNECTED);
   }
   async recoverConnect() {
     await this.disconnect();
@@ -162,7 +174,8 @@ class SubstrateApi {
     });
   }
   onConnect() {
-    this.updateConnectedStatus(true);
+    this.updateConnectionStatus(_types2._ChainConnectionStatus.CONNECTED);
+    this.substrateRetry = 0;
     console.log(`Connected to ${this.chainSlug || ''} at ${this.apiUrl}`);
     if (this.isApiReadyOnce) {
       this.handleApiReady.resolve(this);
@@ -171,8 +184,14 @@ class SubstrateApi {
   onDisconnect() {
     this.isApiReady = false;
     console.log(`Disconnected from ${this.chainSlug} at ${this.apiUrl}`);
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_types2._ChainConnectionStatus.DISCONNECTED);
     this.handleApiReady = (0, _promise.createPromiseHandler)();
+    this.substrateRetry += 1;
+    if (this.substrateRetry > 9) {
+      this.disconnect().then(() => {
+        this.updateConnectionStatus(_types2._ChainConnectionStatus.UNSTABLE);
+      }).catch(console.error);
+    }
   }
   onError(e) {
     console.warn(`${this.chainSlug} connection got error`, e);

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

@@ -41,12 +41,12 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
 
       // Not found substrateInterface mean it active with evm interface
       if (api) {
-        api === null || api === void 0 ? void 0 : api.connect();
+        api.connect();
         if (!api.useLightClient) {
           // Manual fire handle connect to avoid some chain can not reconnect
           setTimeout(() => {
-            this.handleConnect(chain, api.isApiConnected);
-          }, _AbstractChainHandler.SHORT_RETRY_TIME);
+            this.handleConnection(chain, api.connectionStatus);
+          }, 10000);
         }
       }
     }
@@ -202,8 +202,8 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
       metadata,
       externalApiPromise
     });
-    apiObject.isApiConnectedSubject.subscribe(this.handleConnect.bind(this, chainSlug));
-    onUpdateStatus && apiObject.isApiConnectedSubject.subscribe(onUpdateStatus);
+    apiObject.connectionStatusSubject.subscribe(this.handleConnection.bind(this, chainSlug));
+    onUpdateStatus && apiObject.connectionStatusSubject.subscribe(onUpdateStatus);
 
     // Update metadata to database with async methods
     apiObject.isReady.then(api => {