@subwallet/extension-base 1.0.4-0 → 1.0.5-1

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

@@ -65,7 +65,7 @@ export default class KoniState {
     getMetaRequest(id: string): MetaRequest;
     getSignRequest(id: string): SignRequest | undefined;
     rpcListProviders(): Promise<ResponseRpcListProviders>;
-    rpcSend(request: RequestRpcSend, port: chrome.runtime.Port): Promise<JsonRpcResponse>;
+    rpcSend(request: RequestRpcSend, port: chrome.runtime.Port): Promise<JsonRpcResponse<unknown>>;
     rpcStartProvider(key: string, port: chrome.runtime.Port): Promise<ProviderMeta>;
     rpcSubscribe({ method, params, type }: RequestRpcSubscribe, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): Promise<number | string>;
     rpcSubscribeConnected(_request: null, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): void;
@@ -133,6 +133,8 @@ export default class KoniState {
     setTheme(theme: ThemeNames, callback?: (settingData: UiSettings) => void): void;
     setBrowserConfirmationType(browserConfirmationType: BrowserConfirmationType, callback?: (settingData: UiSettings) => void): void;
     setCamera(value: boolean): void;
+    setAutoLockTime(value: number): void;
+    setEnableChainPatrol(value: boolean): void;
     subscribeSettingsSubject(): Subject<RequestSettingsType>;
     getAccountAddress(): string | null;
     getDecodedAddresses(address?: string): string[];
@@ -221,5 +223,6 @@ export default class KoniState {
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
+    resetWallet(resetAll: boolean): Promise<void>;
 }
 export {};

package/koni/background/handlers/State.js

@@ -198,7 +198,6 @@ export default class KoniState {
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
-    this.logger.log('Done init state');
   }
   startSubscription() {
     this.dbService.subscribeChainStakingMetadata([], data => {
@@ -214,7 +213,6 @@ export default class KoniState {
     this.historyService.start().catch(console.error);
     this.priceService.start().catch(console.error);
     this.ready = true;
-    this.logger.log('State is ready');
   }
   isReady() {
     return this.ready;
@@ -607,7 +605,24 @@ export default class KoniState {
         ...settings,
         camera: value
       };
-      console.log(newSettings, value);
+      this.settingService.setSettings(newSettings);
+    });
+  }
+  setAutoLockTime(value) {
+    this.settingService.getSettings(settings => {
+      const newSettings = {
+        ...settings,
+        timeAutoLock: value
+      };
+      this.settingService.setSettings(newSettings);
+    });
+  }
+  setEnableChainPatrol(value) {
+    this.settingService.getSettings(settings => {
+      const newSettings = {
+        ...settings,
+        enableChainPatrol: value
+      };
       this.settingService.setSettings(newSettings);
     });
   }
@@ -1426,4 +1441,16 @@ export default class KoniState {
   async reloadStaking() {
     return await this.cron.reloadStaking();
   }
+  async resetWallet(resetAll) {
+    this.keyringService.resetWallet(resetAll);
+    this.requestService.resetWallet();
+    this.transactionService.resetWallet();
+    await this.dbService.resetWallet(resetAll);
+    this.accountRefStore.set('refList', []);
+    if (resetAll) {
+      this.settingService.resetWallet();
+    }
+    this.chainService.resetWallet(resetAll);
+    await this.chainService.init();
+  }
 }

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

@@ -3,6 +3,7 @@ import { AuthUrlInfo } from '@subwallet/extension-base/background/handlers/State
 import { MessageTypes, RequestTypes, ResponseTypes } from '@subwallet/extension-base/background/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { RequestArguments } from 'web3-core';
+export declare const chainPatrolCheckUrl: (url: string) => Promise<boolean>;
 export default class KoniTabs {
     #private;
     private evmEventEmitterMap;

package/koni/background/handlers/Tabs.js

@@ -11,6 +11,7 @@ import RequestExtrinsicSign from '@subwallet/extension-base/background/RequestEx
 import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS } from '@subwallet/extension-base/constants';
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
+import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
 import { canDerive } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
 import Web3 from 'web3';
@@ -63,11 +64,35 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
     type
   }));
 }
+// check if a URL is blocked
+export const chainPatrolCheckUrl = async url => {
+  const response = await fetch('https://app.chainpatrol.io/api/v2/asset/check', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-API-KEY': 'e5e88cd0-7994-4667-9071-bab849c2ba71'
+    },
+    body: JSON.stringify({
+      type: 'URL',
+      content: url
+    })
+  });
+  const data = await response.json();
+  return data.status === 'BLOCKED';
+};
 export default class KoniTabs {
   #koniState;
   evmEventEmitterMap = {};
+  #chainPatrolService = DEFAULT_CHAIN_PATROL_ENABLE;
   constructor(koniState) {
     this.#koniState = koniState;
+    const updateChainPatrolService = rs => {
+      this.#chainPatrolService = rs.enableChainPatrol;
+    };
+    this.#koniState.settingService.getSettings(updateChainPatrolService);
+    this.#koniState.settingService.getSubject().subscribe({
+      next: updateChainPatrolService
+    });
   }
 
   /// Clone from Polkadot.js
@@ -160,6 +185,13 @@ export default class KoniTabs {
       this.redirectPhishingLanding(url);
       return true;
     }
+    if (this.#chainPatrolService) {
+      const isInChainPatrolDenyList = await chainPatrolCheckUrl(url);
+      if (isInChainPatrolDenyList) {
+        this.redirectPhishingLanding(url);
+        return true;
+      }
+    }
     return false;
   }
 
@@ -649,7 +681,6 @@ export default class KoniTabs {
     const {
       method
     } = request;
-    console.log('method: ' + method);
     try {
       switch (method) {
         case 'eth_chainId':

package/koni/background/handlers/index.js

@@ -46,11 +46,12 @@ export default function handlers({
   const sender = port.sender;
   const from = isExtension ? 'extension' : sender.tab && sender.tab.url || sender.url || '<unknown>';
   const source = `${from}: ${id}: ${message}`;
-  console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);
+
+  // console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);
 
   const promise = isMobile ? mobile.handle(id, message, request, port) : isExtension ? extension.handle(id, message, request, port) : tabs.handle(id, message, request, from, port);
   promise.then(response => {
-    console.log(`[out] ${source}`); // :: ${JSON.stringify(response)}`);
+    // console.log(`[out] ${source}`); // :: ${JSON.stringify(response)}`);
 
     // between the start and the end of the promise, the user may have closed
     // the tab, in which case port will be undefined

package/koni/background/subscription.d.ts

@@ -17,7 +17,6 @@ export declare class KoniSubscription {
     stopAllSubscription(): void;
     start(): void;
     stop(): void;
-    init(): void;
     subscribeBalancesAndCrowdloans(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
     subscribeStakingOnChain(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
     initStakingOnChainSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;

package/koni/background/subscription.js

@@ -25,7 +25,6 @@ export class KoniSubscription {
     this.dbService = dbService;
     this.state = state;
     this.logger = createLogger('Subscription');
-    this.init();
   }
   getSubscriptionMap() {
     return this.subscriptionMap;
@@ -54,7 +53,6 @@ export class KoniSubscription {
   }
   start() {
     var _this$state$keyringSe;
-    this.logger.log('Starting subscription');
     const currentAddress = (_this$state$keyringSe = this.state.keyringService.currentAccount) === null || _this$state$keyringSe === void 0 ? void 0 : _this$state$keyringSe.address;
     if (currentAddress) {
       this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
@@ -67,7 +65,6 @@ export class KoniSubscription {
       if (!needReload) {
         return;
       }
-      this.logger.log('ServiceInfo updated, restarting...');
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
       if (!address) {
         return;
@@ -78,34 +75,12 @@ export class KoniSubscription {
     this.state.eventService.onLazy(this.eventHandler);
   }
   stop() {
-    this.logger.log('Stopping subscription');
     if (this.eventHandler) {
       this.state.eventService.offLazy(this.eventHandler);
       this.eventHandler = undefined;
     }
     this.stopAllSubscription();
   }
-  init() {
-    this.state.getAuthorize(value => {
-      const authString = localStorage.getItem('authUrls') || '{}';
-      const previousAuth = JSON.parse(authString);
-      if (previousAuth && Object.keys(previousAuth).length) {
-        Object.keys(previousAuth).forEach(url => {
-          if (previousAuth[url].isAllowed) {
-            previousAuth[url].isAllowedMap = this.state.getAddressList(true);
-          } else {
-            previousAuth[url].isAllowedMap = this.state.getAddressList();
-          }
-        });
-      }
-      const migrateValue = {
-        ...previousAuth,
-        ...value
-      };
-      this.state.setAuthorize(migrateValue);
-      localStorage.setItem('authUrls', '{}');
-    });
-  }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
     this.state.handleSwitchAccount(address).then(() => {
       const addresses = this.state.getDecodedAddresses(address);
@@ -254,7 +229,6 @@ export class KoniSubscription {
       if (dataFromApi[chainInfo.slug]) {
         this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug]);
       } else {
-        console.warn('Not found staking data from api', chainInfo.slug);
         const chainStakingMetadata = await getChainStakingMetadata(chainInfo, substrateApiMap[chainInfo.slug]);
         this.state.updateChainStakingMetadata(chainStakingMetadata);
       }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.4-0",
+  "version": "1.0.5-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1190,11 +1190,21 @@
       "require": "./cjs/services/history-service/index.js",
       "default": "./services/history-service/index.js"
     },
+    "./services/history-service/helpers/recoverHistoryStatus": {
+      "types": "./services/history-service/helpers/recoverHistoryStatus.d.ts",
+      "require": "./cjs/services/history-service/helpers/recoverHistoryStatus.js",
+      "default": "./services/history-service/helpers/recoverHistoryStatus.js"
+    },
     "./services/history-service/subsquid-multi-chain-history": {
       "types": "./services/history-service/subsquid-multi-chain-history.d.ts",
       "require": "./cjs/services/history-service/subsquid-multi-chain-history.js",
       "default": "./services/history-service/subsquid-multi-chain-history.js"
     },
+    "./services/history-service/testChainMap": {
+      "types": "./services/history-service/testChainMap.d.ts",
+      "require": "./cjs/services/history-service/testChainMap.js",
+      "default": "./services/history-service/testChainMap.js"
+    },
     "./services/keyring-service": {
       "types": "./services/keyring-service/index.d.ts",
       "require": "./cjs/services/keyring-service/index.js",
@@ -1225,6 +1235,21 @@
       "require": "./cjs/services/migration-service/scripts/ClearOldStorage.js",
       "default": "./services/migration-service/scripts/ClearOldStorage.js"
     },
+    "./services/migration-service/scripts/MigrateAuthUrls": {
+      "types": "./services/migration-service/scripts/MigrateAuthUrls.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateAuthUrls.js",
+      "default": "./services/migration-service/scripts/MigrateAuthUrls.js"
+    },
+    "./services/migration-service/scripts/MigrateAutoLock": {
+      "types": "./services/migration-service/scripts/MigrateAutoLock.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateAutoLock.js",
+      "default": "./services/migration-service/scripts/MigrateAutoLock.js"
+    },
+    "./services/migration-service/scripts/MigrateChainPatrol": {
+      "types": "./services/migration-service/scripts/MigrateChainPatrol.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateChainPatrol.js",
+      "default": "./services/migration-service/scripts/MigrateChainPatrol.js"
+    },
     "./services/migration-service/scripts/MigrateImportedToken": {
       "types": "./services/migration-service/scripts/MigrateImportedToken.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateImportedToken.js",
@@ -1430,6 +1455,11 @@
       "require": "./cjs/services/transaction-service/index.js",
       "default": "./services/transaction-service/index.js"
     },
+    "./services/transaction-service/constants": {
+      "types": "./services/transaction-service/constants.d.ts",
+      "require": "./cjs/services/transaction-service/constants.js",
+      "default": "./services/transaction-service/constants.js"
+    },
     "./services/transaction-service/event-parser": {
       "types": "./services/transaction-service/event-parser/index.d.ts",
       "require": "./cjs/services/transaction-service/event-parser/index.js",
@@ -1612,8 +1642,8 @@
     }
   },
   "dependencies": {
-    "@acala-network/api": "^4.1.8-2.3",
-    "@acala-network/type-definitions": "^4.1.5",
+    "@acala-network/api": "^5.0.2",
+    "@acala-network/type-definitions": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@babel/runtime": "^7.20.6",
     "@bifrost-finance/type-definitions": "^1.7.2",
@@ -1623,7 +1653,7 @@
     "@digitalnative/type-definitions": "^1.1.27",
     "@docknetwork/node-types": "^0.15.0",
     "@edgeware/node-types": "^3.6.2-wako",
-    "@equilab/api": "^1.14.12",
+    "@equilab/api": "^1.14.25",
     "@equilab/definitions": "^1.4.18",
     "@ethereumjs/common": "^2.6.5",
     "@ethereumjs/tx": "^4.0.2",
@@ -1634,47 +1664,43 @@
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@google/model-viewer": "^2.0.2",
-    "@interlay/interbtc-types": "^1.11.0",
-    "@kiltprotocol/type-definitions": "^0.30.0",
+    "@interlay/interbtc-types": "^1.12.0",
+    "@kiltprotocol/type-definitions": "^0.32.0",
     "@laminar/type-definitions": "^0.3.1",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/api-augment": "^0.0.23",
     "@oak-foundation/types": "^0.0.23",
-    "@parallel-finance/type-definitions": "^1.7.14",
-    "@phala/typedefs": "^0.2.32",
-    "@polkadot/api": "^9.10.3",
-    "@polkadot/api-contract": "^9.10.3",
-    "@polkadot/api-derive": "^9.10.3",
-    "@polkadot/hw-ledger": "^10.1.9",
-    "@polkadot/keyring": "^10.2.1",
-    "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.21.2",
-    "@polkadot/react-identicon": "^2.9.14",
-    "@polkadot/react-qr": "^2.9.14",
-    "@polkadot/rpc-provider": "^9.10.3",
-    "@polkadot/types": "^9.10.3",
-    "@polkadot/types-augment": "^9.10.3",
-    "@polkadot/ui-keyring": "^2.9.14",
-    "@polkadot/ui-settings": "^2.9.14",
-    "@polkadot/util": "^10.2.1",
-    "@polkadot/util-crypto": "^10.2.1",
+    "@parallel-finance/type-definitions": "^1.7.17",
+    "@phala/typedefs": "^0.2.33",
+    "@polkadot/api": "^10.7.1",
+    "@polkadot/api-contract": "^10.7.1",
+    "@polkadot/api-derive": "^10.7.1",
+    "@polkadot/hw-ledger": "^12.2.1",
+    "@polkadot/networks": "^12.2.1",
+    "@polkadot/phishing": "^0.21.3",
+    "@polkadot/rpc-provider": "^10.7.1",
+    "@polkadot/types": "^10.7.1",
+    "@polkadot/types-augment": "^10.7.1",
+    "@polkadot/ui-settings": "^3.4.1",
+    "@polkadot/util": "^12.2.1",
+    "@polkadot/util-crypto": "^12.2.1",
     "@polymathnetwork/polymesh-types": "^0.0.2",
     "@ramonak/react-progress-bar": "^5.0.3",
     "@reduxjs/toolkit": "^1.9.1",
     "@snowfork/snowbridge-types": "^0.2.7",
-    "@sora-substrate/type-definitions": "^1.12.4",
+    "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
-    "@substrate/connect": "^0.7.18",
+    "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "^0.1.2",
-    "@subwallet/extension-base": "^1.0.4-0",
-    "@subwallet/extension-chains": "^1.0.4-0",
-    "@subwallet/extension-dapp": "^1.0.4-0",
-    "@subwallet/extension-inject": "^1.0.4-0",
-    "@subwallet/keyring": "^0.0.5",
-    "@subwallet/ui-keyring": "^0.0.3",
+    "@subwallet/extension-base": "^1.0.5-1",
+    "@subwallet/extension-chains": "^1.0.5-1",
+    "@subwallet/extension-dapp": "^1.0.5-1",
+    "@subwallet/extension-inject": "^1.0.5-1",
+    "@subwallet/keyring": "^0.0.9",
+    "@subwallet/ui-keyring": "^0.0.9",
     "@unique-nft/types": "^0.6.0-4",
-    "@zeitgeistpm/type-defs": "^0.10.0",
+    "@zeitgeistpm/type-defs": "^1.0.0",
     "@zeroio/type-definitions": "^0.0.14",
     "axios": "^1.2.1",
     "bignumber.js": "^9.1.1",
@@ -1696,16 +1722,16 @@
     "is-buffer": "^2.0.5",
     "json-rpc-engine": "^6.1.0",
     "moment": "^2.29.4",
-    "moonbeam-types-bundle": "^2.0.9",
+    "moonbeam-types-bundle": "^2.0.10",
     "phosphor-react": "^1.4.1",
     "pontem-types-bundle": "^1.0.15",
     "protobufjs": "^7.1.2",
     "rlp": "^3.0.0",
     "rxjs": "^7.8.0",
-    "web3": "^1.9.0",
-    "web3-core": "^1.9.0",
-    "web3-core-helpers": "^1.9.0",
-    "web3-eth-contract": "^1.9.0",
-    "web3-utils": "^1.9.0"
+    "web3": "^1.10.0",
+    "web3-core": "^1.10.0",
+    "web3-core-helpers": "^1.10.0",
+    "web3-eth-contract": "^1.10.0",
+    "web3-utils": "^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.0.4-0'
+  version: '1.0.5-1'
 };

package/services/chain-service/constants.js

@@ -208,6 +208,6 @@ const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'mast
 export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
 export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
-export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/MultiChainAsset.json`;
 export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
 export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;

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

@@ -124,7 +124,7 @@ export class EvmChainHandler {
         contractError
       };
     } catch (e) {
-      this.logger.error('Error response while validating EVM contract', e);
+      this.logger.error(e);
       return {
         name,
         decimals,

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

@@ -30,7 +30,6 @@ export class SubstrateChainHandler {
   resumeAllApis() {
     return Promise.all(Object.values(this.getSubstrateApiMap()).map(async substrateApi => {
       if (!substrateApi.api.isConnected && substrateApi.api.connect) {
-        this.logger.log(`[Substrate] Resuming network [${substrateApi.specName}]`);
         await substrateApi.api.connect();
       }
     }));
@@ -39,7 +38,6 @@ export class SubstrateChainHandler {
     return Promise.all(Object.values(this.getSubstrateApiMap()).map(async substrateApi => {
       if (substrateApi.api.isConnected) {
         var _substrateApi$api, _substrateApi$api2;
-        this.logger.log(`[Substrate] Stopping network [${substrateApi.chainSlug}]`);
         ((_substrateApi$api = substrateApi.api) === null || _substrateApi$api === void 0 ? void 0 : _substrateApi$api.disconnect) && (await ((_substrateApi$api2 = substrateApi.api) === null || _substrateApi$api2 === void 0 ? void 0 : _substrateApi$api2.disconnect()));
       }
     }));
@@ -97,7 +95,6 @@ export class SubstrateChainHandler {
           gasLimit: getDefaultWeightV2(substrateApi.api)
         })]);
         if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
-          this.logger.error('Error response while validating WASM contract');
           return {
             name: '',
             decimals: -1,
@@ -112,7 +109,7 @@ export class SubstrateChainHandler {
           name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
           decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
           symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
-          if (name === '' || symbol === '') {
+          if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
             contractError = true;
           }
           console.log('validate PSP22', name, symbol, decimals);
@@ -124,7 +121,6 @@ export class SubstrateChainHandler {
         }); // read-only operation so no gas limit
 
         if (!collectionIdResp.result.isOk || !collectionIdResp.output) {
-          this.logger.error('Error response while validating WASM contract');
           return {
             name: '',
             decimals: -1,
@@ -149,7 +145,7 @@ export class SubstrateChainHandler {
         contractError
       };
     } catch (e) {
-      this.logger.error('Error validating WASM contract', e);
+      this.logger.error(e);
       return {
         name: '',
         decimals: -1,
@@ -215,7 +211,6 @@ export class SubstrateChainHandler {
       defaultFormatBalance: undefined,
       recoverConnect: () => {
         substrateApi.apiRetry = 0;
-        this.logger.log('Recover connect to ', apiUrl);
         provider.connect().then(this.logger.log).catch(this.logger.error);
       },
       get isReady() {
@@ -237,7 +232,6 @@ export class SubstrateChainHandler {
       }
     };
     api.on('connected', () => {
-      this.logger.log('Substrate API connected to ', apiUrl);
       substrateApi.apiRetry = 0;
       if (substrateApi.isApiReadyOnce) {
         substrateApi.isApiReady = true;
@@ -255,7 +249,6 @@ export class SubstrateChainHandler {
       }
     });
     api.on('ready', () => {
-      this.logger.log('Substrate API ready with', apiUrl);
       this.loadOnReady(registry, api).then(rs => {
         objectSpread(substrateApi, rs);
       }).catch(error => {
@@ -307,7 +300,7 @@ export class SubstrateChainHandler {
     const tokenSymbol = properties.tokenSymbol.unwrapOr([formatBalance.getDefaults().unit, ...DEFAULT_AUX]);
     const tokenDecimals = properties.tokenDecimals.unwrapOr([DEFAULT_DECIMALS]);
     const isDevelopment = systemChainType.isDevelopment || systemChainType.isLocal || isTestChain(systemChain);
-    this.logger.log(`chain: ${systemChain} (${systemChainType.toString()}), ${stringify(properties)}`);
+    this.logger.log(`Connected to ${systemChain} (${systemChainType.toString()}), ${stringify(properties)}`);
 
     // explicitly override the ss58Format as specified
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment

package/services/chain-service/handler/light-client/index.js

@@ -1,12 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import * as Sc from '@substrate/connect';
+import { WellKnownChain } from '@substrate/connect';
 import { ScProvider } from '@polkadot/rpc-provider';
 export const relayChainSpecs = {
-  kusama: ScProvider.WellKnownChain.ksmcc3,
-  polkadot: ScProvider.WellKnownChain.polkadot,
-  rococo: ScProvider.WellKnownChain.rococo_v2_2,
-  westend: ScProvider.WellKnownChain.westend2
+  kusama: WellKnownChain.ksmcc3,
+  polkadot: WellKnownChain.polkadot,
+  rococo: WellKnownChain.rococo_v2_2,
+  westend: WellKnownChain.westend2
 };
 
 // Direct get spec data from @polkadot/react-api repository
@@ -97,14 +99,14 @@ class ProviderPlaceholder {
 export function getSubstrateConnectProvider(specLink) {
   const [relayName, paraName] = specLink.split('/');
   const relaySpec = relayChainSpecs[relayName];
-  const relayProvider = new ScProvider(relaySpec);
+  const relayProvider = new ScProvider(Sc, relaySpec);
   if (!paraName) {
     return relayProvider;
   }
   const paraChainData = paraChainSpecs[specLink];
   let scProvider;
   const scPromise = fetch(paraChainData).then(rs => rs.text()).then(spec => {
-    scProvider = new ScProvider(spec, relayProvider);
+    scProvider = new ScProvider(Sc, spec);
     return scProvider;
   }).catch(console.error);
   return new ProviderPlaceholder(scPromise);

package/services/chain-service/helper/api-helper/spec/acala.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
             council: string[];
         };
         types: {
-            minmax: [number | null | undefined, number | null | undefined] | [(number | undefined)?, (number | undefined)?] | (number | null | undefined)[];
+            minmax: number[] | [(number | undefined)?, (number | undefined)?] | [number, number];
             types: {
                 Keys: string;
             };
@@ -18,7 +18,7 @@ declare const _default: {
             council: string[];
         };
         types: {
-            minmax: [number | null | undefined, number | null | undefined] | [(number | undefined)?, (number | undefined)?] | (number | null | undefined)[];
+            minmax: number[] | [(number | undefined)?, (number | undefined)?] | [number, number];
             types: {
                 Keys: string;
             };
@@ -31,7 +31,7 @@ declare const _default: {
             council: string[];
         };
         types: {
-            minmax: [number | null | undefined, number | null | undefined] | [(number | undefined)?, (number | undefined)?] | (number | null | undefined)[];
+            minmax: number[] | [(number | undefined)?, (number | undefined)?] | [number, number];
             types: {
                 Keys: string;
             };

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

@@ -100,9 +100,10 @@ export declare class ChainService {
     setAssetSettings(assetSettings: Record<string, AssetSetting>, emitEvent?: boolean): void;
     getStoreAssetSettings(): Promise<Record<string, AssetSetting>>;
     getAssetSettings(): Promise<Record<string, AssetSetting>>;
-    updateAssetSetting(assetSlug: string, assetSetting: AssetSetting): Promise<boolean | undefined>;
+    updateAssetSetting(assetSlug: string, assetSetting: AssetSetting, autoEnableNativeToken?: boolean): Promise<boolean | undefined>;
     updateAssetSettingByChain(chainSlug: string, visible: boolean): Promise<void>;
     subscribeAssetSettings(): BehaviorSubject<Record<string, AssetSetting>>;
     getChainLogoMap(): Promise<Record<string, string>>;
     getAssetLogoMap(): Promise<Record<string, string>>;
+    resetWallet(resetAll: boolean): void;
 }