@subwallet/extension-base 1.1.6-1 → 1.1.6-3

package/background/KoniTypes.d.ts

@@ -1533,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/background/handlers/Extension.js

@@ -1424,19 +1424,19 @@ class KoniExtension {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
     const subscription = historySubject.subscribe(histories => {
-      const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+      const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+      cb(histories.filter(item => addresses.some(address => (0, _utils2.isSameAddress)(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+    const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
+    return historySubject.getValue().filter(item => addresses.some(address => (0, _utils2.isSameAddress)(item.address, address)));
   }
 
   // Save address to contact
@@ -1734,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,
@@ -3710,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/packageInfo.js

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

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 => {

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

@@ -395,7 +395,7 @@ class ChainService {
     this.dataMap.assetRefMap = latestAssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    this.updateChainStateMapSubscription();
     this.assetRegistrySubject.next(this.getAssetRegistry());
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
@@ -423,14 +423,14 @@ class ChainService {
       endpoint,
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
-    const onUpdateStatus = isConnected => {
+    const onUpdateStatus = status => {
       const currentStatus = this.getChainStateByKey(chainInfo.slug).connectionStatus;
-      const newStatus = isConnected ? _types3._ChainConnectionStatus.CONNECTED : _types3._ChainConnectionStatus.DISCONNECTED;
 
       // Avoid unnecessary update in case disable chain
-      if (currentStatus !== newStatus) {
-        this.setChainConnectionStatus(chainInfo.slug, newStatus);
-        this.chainStateMapSubject.next(this.getChainStateMap());
+      if (currentStatus !== status) {
+        console.log(chainInfo.name, currentStatus, status);
+        this.setChainConnectionStatus(chainInfo.slug, status);
+        this.updateChainStateMapSubscription();
       }
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
@@ -515,6 +515,12 @@ class ChainService {
     needUpdate && this.updateChainStateMapSubscription();
     return needUpdate;
   }
+  async reconnectChain(chain) {
+    var _this$getSubstrateApi, _this$getEvmApi;
+    await ((_this$getSubstrateApi = this.getSubstrateApi(chain)) === null || _this$getSubstrateApi === void 0 ? void 0 : _this$getSubstrateApi.recoverConnect());
+    await ((_this$getEvmApi = this.getEvmApi(chain)) === null || _this$getEvmApi === void 0 ? void 0 : _this$getEvmApi.recoverConnect());
+    return true;
+  }
   disableChain(chainSlug) {
     const chainInfo = this.getChainInfoByKey(chainSlug);
     const chainStateMap = this.getChainStateMap();

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

@@ -124,6 +124,7 @@ export default class KoniExtension {
     private removeCustomChain;
     private disableChain;
     private enableChain;
+    private reconnectChain;
     private validateNetwork;
     private resetDefaultNetwork;
     private recoverDotSamaApi;

package/koni/background/handlers/Extension.js

@@ -27,7 +27,7 @@ import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/reques
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
-import { reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { isSameAddress, reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
 import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
@@ -1372,19 +1372,19 @@ export default class KoniExtension {
     const cb = createSubscription(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
     const subscription = historySubject.subscribe(histories => {
-      const addresses = keyring.getAccounts().map(a => a.address.toLowerCase());
+      const addresses = keyring.getAccounts().map(a => a.address);
 
       // Re-filter
-      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+      cb(histories.filter(item => addresses.some(address => isSameAddress(item.address, address))));
     });
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    const addresses = keyring.getAccounts().map(a => a.address.toLowerCase());
+    const addresses = keyring.getAccounts().map(a => a.address);
 
     // Re-filter
-    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
+    return historySubject.getValue().filter(item => addresses.some(address => isSameAddress(item.address, address)));
   }
 
   // Save address to contact
@@ -1681,6 +1681,9 @@ export default class KoniExtension {
   }) {
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
+  async reconnectChain(chainSlug) {
+    return this.#koniState.chainService.reconnectChain(chainSlug);
+  }
   async validateNetwork({
     existedChainSlug,
     provider
@@ -3611,6 +3614,8 @@ export default 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/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.6-1",
+  "version": "1.1.6-3",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1188,11 +1188,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.9-beta.1",
-    "@subwallet/extension-base": "^1.1.6-1",
-    "@subwallet/extension-chains": "^1.1.6-1",
-    "@subwallet/extension-dapp": "^1.1.6-1",
-    "@subwallet/extension-inject": "^1.1.6-1",
+    "@subwallet/chain-list": "0.2.9",
+    "@subwallet/extension-base": "^1.1.6-3",
+    "@subwallet/extension-chains": "^1.1.6-3",
+    "@subwallet/extension-dapp": "^1.1.6-3",
+    "@subwallet/extension-inject": "^1.1.6-3",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.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.1.6-1'
+  version: '1.1.6-3'
 };

package/services/chain-service/handler/AbstractChainHandler.d.ts

@@ -1,18 +1,17 @@
 /// <reference types="node" />
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _ApiOptions } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { _ChainBaseApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainBaseApi, _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { BehaviorSubject } from 'rxjs';
 export declare const FIRST_RECONNECT_TIME = 3000;
-export declare const SHORT_RETRY_TIME = 15000;
-export declare const LONG_RETRY_TIME = 60000;
+export declare const SHORT_RETRY_TIME = 20000;
 interface RetryObject {
     retryTimes: number;
     timeout?: NodeJS.Timer;
 }
 export declare abstract class AbstractChainHandler {
     protected parent?: ChainService | undefined;
-    readonly apiStateMapSubject: BehaviorSubject<Record<string, boolean>>;
+    readonly apiStateMapSubject: BehaviorSubject<Record<string, _ChainConnectionStatus>>;
     protected recoverMap: Record<string, RetryObject>;
     protected isSleeping: boolean;
     protected constructor(parent?: ChainService | undefined);
@@ -21,8 +20,9 @@ export declare abstract class AbstractChainHandler {
     abstract recoverApi(chainSlug: string): void;
     abstract sleep(): Promise<void>;
     abstract wakeUp(): Promise<void>;
-    handleConnect(chain: string, isConnected: boolean): void;
+    handleConnection(chain: string, newStatus: _ChainConnectionStatus, forceRecover?: boolean): void;
     protected handleRecover(chain: string): void;
+    protected isRecovering(chain: string): boolean;
     protected cancelRecover(chain: string): void;
     cancelAllRecover(): void;
 }

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

@@ -1,11 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { BehaviorSubject } from 'rxjs';
-const SHORT_RECOVER_RETRY = 3;
+const MAX_RECOVER_RETRY = 6;
 export const FIRST_RECONNECT_TIME = 3000;
-export const SHORT_RETRY_TIME = 15000;
-export const LONG_RETRY_TIME = 60000;
+export const SHORT_RETRY_TIME = 20000;
+// export const LONG_RETRY_TIME = 60000;
+
 export class AbstractChainHandler {
   apiStateMapSubject = new BehaviorSubject({});
   // Recover retry times
@@ -15,20 +17,25 @@ export class AbstractChainHandler {
     this.parent = parent;
     this.recoverMap = {};
   }
-  handleConnect(chain, isConnected) {
+  handleConnection(chain, newStatus, forceRecover = 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 === _ChainConnectionStatus.CONNECTED) {
+      this.cancelRecover(chain);
+    }
+
     // Handle connection change
-    if (!isConnected) {
+    if ((!this.isRecovering(chain) || forceRecover) && newStatus === _ChainConnectionStatus.DISCONNECTED) {
       this.handleRecover(chain);
     }
   }
@@ -48,8 +55,13 @@ export class AbstractChainHandler {
     };
     clearTimeout(retryRecord.timeout);
     const retryTimes = retryRecord.retryTimes;
+    if (retryTimes >= MAX_RECOVER_RETRY) {
+      this.handleConnection(chain, _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(() => {
@@ -68,6 +80,9 @@ export class AbstractChainHandler {
       timeout
     };
   }
+  isRecovering(chain) {
+    return !!this.recoverMap[chain];
+  }
   cancelRecover(chain) {
     const retryRecord = this.recoverMap[chain];
     if (retryRecord) {

package/services/chain-service/handler/EvmApi.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import '@polkadot/types-augment';
 import { _ApiOptions } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainConnectionStatus, _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import { PromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { BehaviorSubject } from 'rxjs';
 import Web3 from 'web3';
@@ -14,13 +14,15 @@ export declare class EvmApi implements _EvmApi {
     apiError?: string;
     apiRetry: number;
     readonly isApiConnectedSubject: BehaviorSubject<boolean>;
+    readonly connectionStatusSubject: BehaviorSubject<_ChainConnectionStatus>;
     isApiReady: boolean;
     isApiReadyOnce: boolean;
     isReadyHandler: PromiseHandler<_EvmApi>;
     intervalCheckApi: NodeJS.Timer;
     providerName: string;
     get isApiConnected(): boolean;
-    private updateConnectedStatus;
+    get connectionStatus(): _ChainConnectionStatus;
+    private updateConnectionStatus;
     get isReady(): Promise<_EvmApi>;
     updateApiUrl(apiUrl: string): Promise<void>;
     recoverConnect(): Promise<void>;

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

@@ -2,21 +2,30 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import '@polkadot/types-augment';
+import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { BehaviorSubject } from 'rxjs';
 import Web3 from 'web3';
 export class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new BehaviorSubject(false);
+  connectionStatusSubject = new BehaviorSubject(_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 === _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;
@@ -72,6 +81,7 @@ export class EvmApi {
     // For websocket provider, connect it
     const wsProvider = this.provider;
     wsProvider.connect && wsProvider.connect();
+    this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
     // Check if api is ready
     this.api.eth.net.isListening().then(() => {
       this.isApiReadyOnce = true;
@@ -80,7 +90,7 @@ export class EvmApi {
       this.isApiReadyOnce = false;
       this.isApiReady = false;
       this.isReadyHandler.reject(error);
-      this.updateConnectedStatus(false);
+      this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
       console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
     });
 
@@ -94,7 +104,7 @@ export class EvmApi {
     // For websocket provider, disconnect it
     const wsProvider = this.provider;
     wsProvider.disconnect && wsProvider.disconnect();
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
     return Promise.resolve();
   }
   destroy() {
@@ -109,10 +119,10 @@ export class EvmApi {
         this.isReadyHandler.resolve(this);
       }
     }
-    this.updateConnectedStatus(true);
+    this.updateConnectionStatus(_ChainConnectionStatus.CONNECTED);
   }
   onDisconnect() {
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
     if (this.isApiConnected) {
       console.warn(`Disconnected from ${this.chainSlug} of ${this.apiUrl} (EVM)`);
       this.isApiReady = false;

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

@@ -39,8 +39,8 @@ export class EvmChainHandler extends AbstractChainHandler {
     const apiObject = new 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/services/chain-service/handler/SubstrateApi.d.ts

@@ -1,7 +1,7 @@
 import '@polkadot/types-augment';
 import { MetadataItem } from '@subwallet/extension-base/background/KoniTypes';
 import { _ApiOptions } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { _SubstrateApi, _SubstrateDefaultFormatBalance } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainConnectionStatus, _SubstrateApi, _SubstrateDefaultFormatBalance } from '@subwallet/extension-base/services/chain-service/types';
 import { BehaviorSubject } from 'rxjs';
 import { ApiPromise } from '@polkadot/api';
 import { SubmittableExtrinsicFunction } from '@polkadot/api/promise/types';
@@ -20,8 +20,11 @@ export declare class SubstrateApi implements _SubstrateApi {
     apiError?: string;
     private handleApiReady;
     readonly isApiConnectedSubject: BehaviorSubject<boolean>;
+    readonly connectionStatusSubject: BehaviorSubject<_ChainConnectionStatus>;
     get isApiConnected(): boolean;
-    private updateConnectedStatus;
+    substrateRetry: number;
+    get connectionStatus(): _ChainConnectionStatus;
+    private updateConnectionStatus;
     apiDefaultTx?: SubmittableExtrinsicFunction;
     apiDefaultTxSudo?: SubmittableExtrinsicFunction;
     defaultFormatBalance?: _SubstrateDefaultFormatBalance;

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

@@ -7,6 +7,7 @@ import { rpc as oakRpc, types as oakTypes } from '@oak-foundation/types';
 import { _API_OPTIONS_CHAIN_GROUP, API_AUTO_CONNECT_MS, API_CONNECT_TIMEOUT } from '@subwallet/extension-base/services/chain-service/constants';
 import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/chain-service/handler/light-client';
 import { DEFAULT_AUX } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
+import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { spec as availSpec } from 'avail-js-sdk';
 import { BehaviorSubject } from 'rxjs';
@@ -20,13 +21,22 @@ export class SubstrateApi {
   isApiReady = false;
   isApiReadyOnce = false;
   isApiConnectedSubject = new BehaviorSubject(false);
+  connectionStatusSubject = new BehaviorSubject(_ChainConnectionStatus.DISCONNECTED);
   get isApiConnected() {
     return this.isApiConnectedSubject.getValue();
   }
-  updateConnectedStatus(isConnected) {
+  substrateRetry = 0;
+  get connectionStatus() {
+    return this.connectionStatusSubject.getValue();
+  }
+  updateConnectionStatus(status) {
+    const isConnected = status === _ChainConnectionStatus.CONNECTED;
     if (isConnected !== this.isApiConnectedSubject.value) {
       this.isApiConnectedSubject.next(isConnected);
     }
+    if (status !== this.connectionStatusSubject.value) {
+      this.connectionStatusSubject.next(status);
+    }
   }
   specName = '';
   specVersion = '';
@@ -54,12 +64,14 @@ export class SubstrateApi {
         [`${metadata.genesisHash}-${metadata.specVersion}`]: metadata.hexValue
       };
     }
+    this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
+    let api;
     if (_API_OPTIONS_CHAIN_GROUP.acala.includes(this.chainSlug)) {
-      return new ApiPromise(acalaOptions({
+      api = new ApiPromise(acalaOptions({
         provider
       }));
     } else if (_API_OPTIONS_CHAIN_GROUP.turing.includes(this.chainSlug)) {
-      return new ApiPromise({
+      api = new ApiPromise({
         provider,
         rpc: oakRpc,
         types: oakTypes
@@ -72,8 +84,13 @@ export class SubstrateApi {
         signedExtensions: availSpec.signedExtensions
       });
     } else {
-      return new ApiPromise(apiOption);
+      api = new 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, {
     externalApiPromise,
@@ -88,10 +105,6 @@ export class SubstrateApi {
     this.provider = this.createProvider(apiUrl);
     this.api = externalApiPromise || this.createApi(this.provider);
     this.handleApiReady = 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;
@@ -113,17 +126,16 @@ export 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(_ChainConnectionStatus.CONNECTED);
     } else {
+      this.updateConnectionStatus(_ChainConnectionStatus.CONNECTING);
       this.api.connect().then(() => {
-        this.updateConnectedStatus(true);
+        this.api.isReady.then(() => {
+          this.updateConnectionStatus(_ChainConnectionStatus.CONNECTED);
+        }).catch(console.error);
       }).catch(console.error);
     }
   }
@@ -133,7 +145,7 @@ export class SubstrateApi {
     } catch (e) {
       console.error(e);
     }
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
   }
   async recoverConnect() {
     await this.disconnect();
@@ -155,7 +167,8 @@ export class SubstrateApi {
     });
   }
   onConnect() {
-    this.updateConnectedStatus(true);
+    this.updateConnectionStatus(_ChainConnectionStatus.CONNECTED);
+    this.substrateRetry = 0;
     console.log(`Connected to ${this.chainSlug || ''} at ${this.apiUrl}`);
     if (this.isApiReadyOnce) {
       this.handleApiReady.resolve(this);
@@ -164,8 +177,14 @@ export class SubstrateApi {
   onDisconnect() {
     this.isApiReady = false;
     console.log(`Disconnected from ${this.chainSlug} at ${this.apiUrl}`);
-    this.updateConnectedStatus(false);
+    this.updateConnectionStatus(_ChainConnectionStatus.DISCONNECTED);
     this.handleApiReady = createPromiseHandler();
+    this.substrateRetry += 1;
+    if (this.substrateRetry > 9) {
+      this.disconnect().then(() => {
+        this.updateConnectionStatus(_ChainConnectionStatus.UNSTABLE);
+      }).catch(console.error);
+    }
   }
   onError(e) {
     console.warn(`${this.chainSlug} connection got error`, e);

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

@@ -3,7 +3,7 @@
 
 import { _AssetType } from '@subwallet/chain-list/types';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
-import { AbstractChainHandler, SHORT_RETRY_TIME } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
+import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
 import { SubstrateApi } from '@subwallet/extension-base/services/chain-service/handler/SubstrateApi';
 import { ContractPromise } from '@polkadot/api-contract';
 import { BN } from '@polkadot/util';
@@ -34,12 +34,12 @@ export class SubstrateChainHandler extends 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);
-          }, SHORT_RETRY_TIME);
+            this.handleConnection(chain, api.connectionStatus);
+          }, 10000);
         }
       }
     }
@@ -194,8 +194,8 @@ export class SubstrateChainHandler extends 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 => {

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

@@ -1,4 +1,5 @@
 import { MetadataItem } from '@subwallet/extension-base/background/KoniTypes';
+import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { ApiPromise } from '@polkadot/api';
 export interface _EvmChainSpec {
     evmChainId: number;
@@ -19,7 +20,7 @@ export interface _SubstrateChainSpec {
 export interface _ApiOptions {
     providerName?: string;
     metadata?: MetadataItem;
-    onUpdateStatus?: (isConnected: boolean) => void;
+    onUpdateStatus?: (status: _ChainConnectionStatus) => void;
     externalApiPromise?: ApiPromise;
 }
 export declare enum _CHAIN_VALIDATION_ERROR {

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

@@ -73,6 +73,7 @@ export declare class ChainService {
     private destroyApiForChain;
     enableChain(chainSlug: string): Promise<boolean>;
     enableChains(chainSlugs: string[]): Promise<boolean>;
+    reconnectChain(chain: string): Promise<boolean>;
     disableChain(chainSlug: string): boolean;
     private checkExistedPredefinedChain;
     private fetchLatestData;

package/services/chain-service/index.js

@@ -381,7 +381,7 @@ export class ChainService {
     this.dataMap.assetRefMap = latestAssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
-    this.chainStateMapSubject.next(this.getChainStateMap());
+    this.updateChainStateMapSubscription();
     this.assetRegistrySubject.next(this.getAssetRegistry());
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
     await this.initApis();
@@ -407,14 +407,14 @@ export class ChainService {
       endpoint,
       providerName
     } = this.getChainCurrentProviderByKey(chainInfo.slug);
-    const onUpdateStatus = isConnected => {
+    const onUpdateStatus = status => {
       const currentStatus = this.getChainStateByKey(chainInfo.slug).connectionStatus;
-      const newStatus = isConnected ? _ChainConnectionStatus.CONNECTED : _ChainConnectionStatus.DISCONNECTED;
 
       // Avoid unnecessary update in case disable chain
-      if (currentStatus !== newStatus) {
-        this.setChainConnectionStatus(chainInfo.slug, newStatus);
-        this.chainStateMapSubject.next(this.getChainStateMap());
+      if (currentStatus !== status) {
+        console.log(chainInfo.name, currentStatus, status);
+        this.setChainConnectionStatus(chainInfo.slug, status);
+        this.updateChainStateMapSubscription();
       }
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
@@ -499,6 +499,12 @@ export class ChainService {
     needUpdate && this.updateChainStateMapSubscription();
     return needUpdate;
   }
+  async reconnectChain(chain) {
+    var _this$getSubstrateApi, _this$getEvmApi;
+    await ((_this$getSubstrateApi = this.getSubstrateApi(chain)) === null || _this$getSubstrateApi === void 0 ? void 0 : _this$getSubstrateApi.recoverConnect());
+    await ((_this$getEvmApi = this.getEvmApi(chain)) === null || _this$getEvmApi === void 0 ? void 0 : _this$getEvmApi.recoverConnect());
+    return true;
+  }
   disableChain(chainSlug) {
     const chainInfo = this.getChainInfoByKey(chainSlug);
     const chainStateMap = this.getChainStateMap();

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

@@ -38,6 +38,7 @@ export interface _ChainBaseApi {
     isApiConnectedSubject: BehaviorSubject<boolean>;
     isApiReadyOnce: boolean;
     isApiConnected: boolean;
+    connectionStatus: _ChainConnectionStatus;
     updateApiUrl: (apiUrl: string) => Promise<void>;
     connect: () => void;
     disconnect: () => Promise<void>;