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

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/cjs/services/migration-service/scripts/MigrateWalletReference.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _uuid = require("uuid");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateWalletReference extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          const walletReference = (0, _uuid.v4)();
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            walletReference: walletReference
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateWalletReference;

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

@@ -15,6 +15,7 @@ var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccou
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
+var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -30,7 +31,8 @@ var _default = {
   '1.0.3-01': _MigrateAutoLock.default,
   '1.0.3-02': _MigrateChainPatrol.default,
   '1.0.9-01': _MigrateLedgerAccount.default,
-  '1.0.12-02': _MigrateEthProvider.default
+  '1.0.12-02': _MigrateEthProvider.default,
+  '1.1.6-01': _MigrateWalletReference.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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

@@ -35,6 +35,7 @@ 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: ''
 };
 exports.DEFAULT_SETTING = DEFAULT_SETTING;

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

@@ -14,11 +14,11 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
   getNft(addresses) {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     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) {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];

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

@@ -18,9 +18,9 @@ class StakingStore extends _BaseStoreWithAddressAndChain.default {
   getStakings(addresses) {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     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();

package/koni/api/nft/config.d.ts

@@ -20,7 +20,7 @@ export declare const GATEWAY_IPFS_IO = "https://gateway.ipfs.io/ipfs/";
 export declare const DWEB_LINK = "https://dweb.link/ipfs/";
 export declare const IPFS_GATEWAY_4EVERLAND = "https://4everland.io/ipfs/";
 export declare const IPFS_FLEEK = "https://ipfs.fleek.co/ipfs/";
-export declare const IPFS_HARDBIN = "https://hardbin.com/ipfs";
+export declare const IPFS_HARDBIN = "https://hardbin.com/ipfs/";
 export declare enum SUPPORTED_NFT_NETWORKS {
     karura = "karura",
     acala = "acala",

package/koni/api/nft/config.js

@@ -24,7 +24,7 @@ export const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
 export const DWEB_LINK = 'https://dweb.link/ipfs/';
 export const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 export const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
-export const IPFS_HARDBIN = 'https://hardbin.com/ipfs';
+export const IPFS_HARDBIN = 'https://hardbin.com/ipfs/';
 export let SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
   SUPPORTED_NFT_NETWORKS["karura"] = "karura";

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

@@ -199,23 +199,24 @@ export 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: parseRawNumber(collatorInfo.total).toString(),
-        ownStake: parseRawNumber(collatorInfo.stake).toString(),
-        otherStake: (parseRawNumber(collatorInfo.total) - 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 BN(collatorInfo.total);
+    const bnOwnStake = new 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/koni/api/staking/bonding/paraChain.js

@@ -26,7 +26,7 @@ export function validateParaChainUnbondingCondition(amount, nominatorMetadata, c
   const bnRemainingStake = bnActiveStake.sub(new BN(amount));
   const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new BN(targetNomination.validatorMinStake || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
+  const bnMinStake = BN.max(bnCollatorMinStake, bnChainMinStake);
   if (targetNomination.hasUnstaking) {
     errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
   }
@@ -83,9 +83,10 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
 }
 export 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 = 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) * (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default);
     callback(chain, {
@@ -314,17 +315,21 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
     const _collatorAddress = collator[0].toHuman();
     const collatorAddress = _collatorAddress[0];
     const collatorInfo = collator[1].toPrimitive();
+    const bnTotalStake = new BN(collatorInfo.totalCounted);
+    const bnOwnStake = new BN(collatorInfo.bond);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    const bnMinBond = new 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
     });
@@ -336,10 +341,6 @@ export 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 BN(rawBond.replaceAll(',', ''));
-    const delegationCount = parseRawNumber(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.delegationCount);
-    const minDelegation = 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;
@@ -351,21 +352,14 @@ export 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/koni/api/staking/bonding/utils.d.ts

@@ -38,10 +38,10 @@ export interface ParachainStakingStakeOption {
     amount: number;
 }
 export interface ParachainStakingCandidateMetadata {
-    bond: number;
+    bond: string;
     delegationCount: number;
-    totalCounted: number;
-    lowestTopDelegationAmount: number;
+    totalCounted: string;
+    lowestTopDelegationAmount: string;
     status: any | 'Active';
 }
 export declare enum PalletParachainStakingRequestType {

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

@@ -1371,12 +1371,20 @@ export default class KoniExtension {
   async subscribeHistory(id, port) {
     const cb = 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 = 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 = keyring.getAccounts().map(a => a.address.toLowerCase());
+
+    // Re-filter
+    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
   }
 
   // Save address to contact
@@ -1673,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
@@ -3603,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/koni/background/handlers/Tabs.js

@@ -843,11 +843,7 @@ export default 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, {
     genesisHash,

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.6-0",
+  "version": "1.1.6-2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -695,6 +695,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistory.js",
       "default": "./services/migration-service/scripts/MigrateTransactionHistory.js"
     },
+    "./services/migration-service/scripts/MigrateWalletReference": {
+      "types": "./services/migration-service/scripts/MigrateWalletReference.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateWalletReference.js",
+      "default": "./services/migration-service/scripts/MigrateWalletReference.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -1183,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.8",
-    "@subwallet/extension-base": "^1.1.6-0",
-    "@subwallet/extension-chains": "^1.1.6-0",
-    "@subwallet/extension-dapp": "^1.1.6-0",
-    "@subwallet/extension-inject": "^1.1.6-0",
+    "@subwallet/chain-list": "0.2.9",
+    "@subwallet/extension-base": "^1.1.6-2",
+    "@subwallet/extension-chains": "^1.1.6-2",
+    "@subwallet/extension-dapp": "^1.1.6-2",
+    "@subwallet/extension-inject": "^1.1.6-2",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1214,6 +1219,7 @@
     "moment": "^2.29.4",
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
+    "uuid": "^9.0.0",
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",
     "web3-core-helpers": "^1.10.0",

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-0'
+  version: '1.1.6-2'
 };

package/page/SubWalleEvmProvider.d.ts

@@ -12,12 +12,13 @@ export declare class SubWalletEvmProvider extends SafeEventEmitter implements Ev
     readonly version: string;
     protected sendMessage: SendRequest;
     protected _connected: boolean;
-    protected _subscribed: boolean;
     constructor(sendMessage: SendRequest, version: string);
     get connected(): boolean;
     isConnected(): boolean;
     protected subscribeExtensionEvents(): void;
     enable(): Promise<unknown>;
+    on(eventName: string | symbol, listener: (...args: any[]) => void): this;
+    once(eventName: string | symbol, listener: (...args: any[]) => void): this;
     request<T>({ method, params }: RequestArguments): Promise<T>;
     private _sendSync;
     send<T>(method: string, params?: T[]): Promise<JsonRpcResponse<T>>;

package/page/SubWalleEvmProvider.js

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import SafeEventEmitter from '@metamask/safe-event-emitter';
+let subscribeFlag = false;
 export class SubWalletEvmProvider extends SafeEventEmitter {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _subscribed = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -20,7 +20,7 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
     return this._connected;
   }
   subscribeExtensionEvents() {
-    if (this._subscribed) {
+    if (subscribeFlag) {
       return;
     }
     this.sendMessage('evm(events.subscribe)', null, ({
@@ -41,18 +41,32 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
         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({
     method,
     params
   }) {
+    // Subscribe events
     switch (method) {
       case 'eth_requestAccounts':
         return new Promise((resolve, reject) => {
@@ -61,9 +75,6 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            // Subscribe event
-            this.subscribeExtensionEvents();
-
             // Return account list
             this.request({
               method: 'eth_accounts'

package/services/chain-service/constants.js

@@ -49,13 +49,13 @@ export const _NFT_CHAIN_GROUP = {
 // Staking--------------------------------------------------------------------------------------------------------------
 
 export 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
@@ -87,7 +87,9 @@ export const _STAKING_ERA_LENGTH_MAP = {
   amplitude_test: 2,
   pendulum: 2,
   kilt: 2,
-  kilt_peregrine: 2
+  kilt_peregrine: 2,
+  edgeware: 6,
+  kate: 6
 };
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {

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