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

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>;

package/services/migration-service/scripts/MigrateWalletReference.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateWalletReference extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateWalletReference.js

@@ -0,0 +1,23 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { v4 as uuidv4 } from 'uuid';
+export default class MigrateWalletReference extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          const walletReference = uuidv4();
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            walletReference: walletReference
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/index.js

@@ -11,6 +11,7 @@ import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
+import MigrateWalletReference from "./MigrateWalletReference.js";
 export const EVERYTIME = '__everytime__';
 export default {
   '1.0.1-11': MigrateNetworkSettings,
@@ -22,6 +23,7 @@ export default {
   '1.0.3-01': MigrateAutoLock,
   '1.0.3-02': MigrateChainPatrol,
   '1.0.9-01': MigrateLedgerAccount,
-  '1.0.12-02': MigrateEthProvider
+  '1.0.12-02': MigrateEthProvider,
+  '1.1.6-01': MigrateWalletReference
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/setting-service/constants.js

@@ -20,5 +20,6 @@ export const DEFAULT_SETTING = {
   theme: DEFAULT_THEME,
   camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
-  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
+  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,
+  walletReference: ''
 };

package/services/storage-service/db-stores/Nft.js

@@ -6,11 +6,11 @@ import { liveQuery } from 'dexie';
 export default class NftStore extends BaseStoreWithAddressAndChain {
   getNft(addresses, chainList = []) {
     if (addresses.length) {
-      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => !chainList.length || chainList.includes(item.chain)).toArray();
+      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => chainList && chainList.includes(item.chain)).toArray();
     }
 
     // return this.table.filter((item) => !chainHashes.length || chainHashes.includes(item.chainHash)).toArray();
-    return this.table.filter(item => !chainList.length || chainList.includes(item.chain)).toArray();
+    return this.table.filter(item => chainList && chainList.includes(item.chain)).toArray();
   }
   subscribeNft(addresses, chainList = []) {
     return liveQuery(() => this.getNft(addresses, chainList));

package/services/storage-service/db-stores/Staking.js

@@ -10,9 +10,9 @@ export default class StakingStore extends BaseStoreWithAddressAndChain {
   }
   getStakings(addresses, chainList = []) {
     if (addresses.length) {
-      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => (!chainList.length || chainList.includes(item.chain)) && parseFloat(item.balance) > 0).toArray();
+      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => chainList && chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();
     }
-    return this.table.filter(item => (!chainList.length || chainList.includes(item.chain)) && parseFloat(item.balance) > 0).toArray();
+    return this.table.filter(item => chainList && chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();
   }
   getStakingsByChains(chainList) {
     return this.table.filter(item => chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();