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

package/cjs/services/request-service/handler/index.js

@@ -0,0 +1,55 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "AuthRequestHandler", {
+  enumerable: true,
+  get: function () {
+    return _AuthRequestHandler.default;
+  }
+});
+Object.defineProperty(exports, "ConnectWCRequestHandler", {
+  enumerable: true,
+  get: function () {
+    return _ConnectWCRequestHandler.default;
+  }
+});
+Object.defineProperty(exports, "EvmRequestHandler", {
+  enumerable: true,
+  get: function () {
+    return _EvmRequestHandler.default;
+  }
+});
+Object.defineProperty(exports, "MetadataRequestHandler", {
+  enumerable: true,
+  get: function () {
+    return _MetadataRequestHandler.default;
+  }
+});
+Object.defineProperty(exports, "NotSupportWCRequestHandler", {
+  enumerable: true,
+  get: function () {
+    return _NotSupportWCRequestHandler.default;
+  }
+});
+Object.defineProperty(exports, "PopupHandler", {
+  enumerable: true,
+  get: function () {
+    return _PopupHandler.default;
+  }
+});
+Object.defineProperty(exports, "SubstrateRequestHandler", {
+  enumerable: true,
+  get: function () {
+    return _SubstrateRequestHandler.default;
+  }
+});
+var _AuthRequestHandler = _interopRequireDefault(require("./AuthRequestHandler"));
+var _ConnectWCRequestHandler = _interopRequireDefault(require("./ConnectWCRequestHandler"));
+var _EvmRequestHandler = _interopRequireDefault(require("./EvmRequestHandler"));
+var _MetadataRequestHandler = _interopRequireDefault(require("./MetadataRequestHandler"));
+var _NotSupportWCRequestHandler = _interopRequireDefault(require("./NotSupportWCRequestHandler"));
+var _PopupHandler = _interopRequireDefault(require("./PopupHandler"));
+var _SubstrateRequestHandler = _interopRequireDefault(require("./SubstrateRequestHandler"));

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

@@ -1,16 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _AuthRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/AuthRequestHandler"));
-var _EvmRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/EvmRequestHandler"));
-var _MetadataRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler"));
-var _PopupHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/PopupHandler"));
-var _SubstrateRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler"));
-var _WalletConnectRequestHandler = _interopRequireDefault(require("@subwallet/extension-base/services/request-service/handler/WalletConnectRequestHandler"));
+var _handler = require("./handler");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -22,19 +16,21 @@ class RequestService {
   #authRequestHandler;
   #substrateRequestHandler;
   #evmRequestHandler;
-  #walletConnectRequestHandler;
+  #connectWCRequestHandler;
+  #notSupportWCRequestHandler;
 
   // Common
   constructor(chainService, settingService, keyringService) {
     this.keyringService = keyringService;
     this.#chainService = chainService;
     this.settingService = settingService;
-    this.#popupHandler = new _PopupHandler.default(this);
-    this.#metadataRequestHandler = new _MetadataRequestHandler.default(this);
-    this.#authRequestHandler = new _AuthRequestHandler.default(this, this.#chainService, this.keyringService);
-    this.#substrateRequestHandler = new _SubstrateRequestHandler.default(this);
-    this.#evmRequestHandler = new _EvmRequestHandler.default(this);
-    this.#walletConnectRequestHandler = new _WalletConnectRequestHandler.default(this);
+    this.#popupHandler = new _handler.PopupHandler(this);
+    this.#metadataRequestHandler = new _handler.MetadataRequestHandler(this);
+    this.#authRequestHandler = new _handler.AuthRequestHandler(this, this.#chainService, this.keyringService);
+    this.#substrateRequestHandler = new _handler.SubstrateRequestHandler(this);
+    this.#evmRequestHandler = new _handler.EvmRequestHandler(this);
+    this.#connectWCRequestHandler = new _handler.ConnectWCRequestHandler(this);
+    this.#notSupportWCRequestHandler = new _handler.NotSupportWCRequestHandler(this);
 
     // Reset icon on start service
     this.updateIconV2();
@@ -170,33 +166,51 @@ class RequestService {
     return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
   }
 
-  // Wallet Connect requests
+  // WalletConnect Connect requests
   getConnectWCRequest(id) {
-    return this.#walletConnectRequestHandler.getConnectWCRequest(id);
+    return this.#connectWCRequestHandler.getConnectWCRequest(id);
   }
   get connectWCSubject() {
-    return this.#walletConnectRequestHandler.connectWCSubject;
+    return this.#connectWCRequestHandler.connectWCSubject;
   }
   get allConnectWCRequests() {
-    return this.#walletConnectRequestHandler.allConnectWCRequests;
+    return this.#connectWCRequestHandler.allConnectWCRequests;
   }
   get numConnectWCRequests() {
-    return this.#walletConnectRequestHandler.numConnectWCRequests;
+    return this.#connectWCRequestHandler.numConnectWCRequests;
   }
   addConnectWCRequest(request) {
-    return this.#walletConnectRequestHandler.addConnectWCRequest(request);
+    return this.#connectWCRequestHandler.addConnectWCRequest(request);
+  }
+
+  // WalletConnect not support requests
+  getNotSupportWCRequest(id) {
+    return this.#notSupportWCRequestHandler.getNotSupportWCRequest(id);
+  }
+  get notSupportWCSubject() {
+    return this.#notSupportWCRequestHandler.notSupportWCSubject;
+  }
+  get allNotSupportWCRequests() {
+    return this.#notSupportWCRequestHandler.allNotSupportWCRequests;
+  }
+  get numNotSupportWCRequests() {
+    return this.#notSupportWCRequestHandler.numNotSupportWCRequests;
+  }
+  addNotSupportWCRequest(request) {
+    return this.#notSupportWCRequestHandler.addNotSupportWCRequest(request);
   }
 
   // General methods
   get numRequests() {
-    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests;
+    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests + this.numNotSupportWCRequests;
   }
   resetWallet() {
     this.#authRequestHandler.resetWallet();
     this.#substrateRequestHandler.resetWallet();
     this.#evmRequestHandler.resetWallet();
     this.#metadataRequestHandler.resetWallet();
-    this.#walletConnectRequestHandler.resetWallet();
+    this.#connectWCRequestHandler.resetWallet();
+    this.#notSupportWCRequestHandler.resetWallet();
   }
 }
 exports.default = RequestService;

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

@@ -22,6 +22,7 @@ var _eth = require("@subwallet/extension-base/utils/eth");
 var _mergeTransactionAndSignature = require("@subwallet/extension-base/utils/eth/mergeTransactionAndSignature");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsUtil = require("ethereumjs-util");
 var _ethers = require("ethers");
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
@@ -120,7 +121,7 @@ class TransactionService {
           }
         } catch (e) {
           const error = e;
-          if (error.message.includes('gas required exceeds allowance')) {
+          if (error.message.includes('gas required exceeds allowance') && error.message.includes('insufficient funds')) {
             validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
           }
           estimateFee.value = '0';
@@ -149,6 +150,9 @@ class TransactionService {
     const balanceNum = parseInt(balance.value);
     const edNum = parseInt(existentialDeposit);
     const transferNativeNum = parseInt(transferNative);
+    if (!new _bignumber.default(balance.value).gt(0)) {
+      validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+    }
     if (transferNativeNum + feeNum > balanceNum) {
       if (!isTransferAll) {
         validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));

package/cjs/services/wallet-connect-service/helpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseRequestParams = exports.isWalletConnectRequest = exports.isSupportWalletConnectNamespace = exports.isSupportWalletConnectChain = exports.isProposalExpired = exports.getWCId = exports.getEip155MessageAddress = exports.convertConnectRequest = void 0;
+exports.parseRequestParams = exports.isWalletConnectRequest = exports.isSupportWalletConnectNamespace = exports.isSupportWalletConnectChain = exports.isProposalExpired = exports.getWCId = exports.getEip155MessageAddress = exports.convertNotSupportRequest = exports.convertConnectRequest = void 0;
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _constants = require("./constants");
@@ -24,6 +24,15 @@ const convertConnectRequest = request => {
   };
 };
 exports.convertConnectRequest = convertConnectRequest;
+const convertNotSupportRequest = (request, url) => {
+  return {
+    id: getWCId(request.id),
+    isInternal: false,
+    request: request,
+    url: url
+  };
+};
+exports.convertNotSupportRequest = convertNotSupportRequest;
 const parseRequestParams = params => {
   // @ts-ignore
   return params;

package/cjs/services/wallet-connect-service/index.js

@@ -259,6 +259,11 @@ function _onSessionRequest2(requestEvent) {
     }
   } catch (e) {
     console.log(e);
+    try {
+      const requestSession = this.getSession(topic);
+      const notSupportRequest = (0, _helpers.convertNotSupportRequest)(requestEvent, requestSession.peer.metadata.url);
+      (0, _classPrivateFieldLooseBase2.default)(this, _requestService)[_requestService].addNotSupportWCRequest(notSupportRequest);
+    } catch (e) {}
     this.responseRequest({
       topic: topic,
       response: (0, _utils.formatJsonRpcError)(id, e.message)

package/koni/api/nft/config.js

@@ -68,9 +68,6 @@ export let SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME;
   SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME["pioneer"] = "pioneer";
 })(SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME || (SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = {}));
 const RANDOM_IPFS_GATEWAY_SETTING = [{
-  provider: IPFS_W3S_LINK,
-  weight: 1
-}, {
   provider: CF_IPFS_GATEWAY,
   weight: 4
 }, {
@@ -85,12 +82,6 @@ const RANDOM_IPFS_GATEWAY_SETTING = [{
 }, {
   provider: DWEB_LINK,
   weight: 5
-}, {
-  provider: IPFS_GATEWAY_4EVERLAND,
-  weight: 2
-}, {
-  provider: IPFS_HARDBIN,
-  weight: 1
 }];
 if (!RuntimeInfo.protocol || RuntimeInfo.protocol && !RuntimeInfo.protocol.startsWith('http')) {
   RANDOM_IPFS_GATEWAY_SETTING.push({
@@ -101,6 +92,18 @@ if (!RuntimeInfo.protocol || RuntimeInfo.protocol && !RuntimeInfo.protocol.start
     provider: IPFS_FLEEK,
     weight: 4
   });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_HARDBIN,
+    weight: 1
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_GATEWAY_4EVERLAND,
+    weight: 2
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_W3S_LINK,
+    weight: 1
+  });
 }
 const RANDOM_IPFS_GATEWAY_TOTAL_WEIGHT = RANDOM_IPFS_GATEWAY_SETTING.reduce((value, item) => value + item.weight, 0);
 export function getRandomIpfsGateway() {

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

@@ -53,7 +53,7 @@ export default class KoniExtension {
     private forgetSite;
     private _forgetAllSite;
     private forgetAllSite;
-    private getNonReadonlyAccounts;
+    private getAccounts;
     private isAddressValidWithAuthType;
     private filterAccountsByAccountAuthType;
     private _changeAuthorizationAll;
@@ -197,6 +197,9 @@ export default class KoniExtension {
     private rejectWalletConnectSession;
     private subscribeWalletConnectSessions;
     private disconnectWalletConnectSession;
+    private WCNotSupportSubscribe;
+    private approveWalletConnectNotSupport;
+    private rejectWalletConnectNotSupport;
     private enableMantaPay;
     private initSyncMantaPay;
     private disableMantaPay;

package/koni/background/handlers/Extension.js

@@ -660,10 +660,10 @@ export default class KoniExtension {
     });
     return true;
   }
-  getNonReadonlyAccounts() {
+  getAccounts() {
     const storedAccounts = this.#koniState.keyringService.accounts;
     const transformedAccounts = transformAccounts(storedAccounts);
-    return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
+    return transformedAccounts.map(a => a.address);
   }
   isAddressValidWithAuthType(address, accountAuthType) {
     if (accountAuthType === 'substrate') {
@@ -685,12 +685,12 @@ export default class KoniExtension {
   _changeAuthorizationAll(connectValue, callBack) {
     this.#koniState.getAuthorize(value => {
       assert(value, 'The source is not known');
-      const nonReadonlyAccounts = this.getNonReadonlyAccounts();
+      const accounts = this.getAccounts();
       Object.keys(value).forEach(url => {
         if (!value[url].isAllowed) {
           return;
         }
-        const targetAccounts = this.filterAccountsByAccountAuthType(nonReadonlyAccounts, value[url].accountAuthType);
+        const targetAccounts = this.filterAccountsByAccountAuthType(accounts, value[url].accountAuthType);
         targetAccounts.forEach(address => {
           value[url].isAllowedMap[address] = connectValue;
         });
@@ -713,8 +713,8 @@ export default class KoniExtension {
   _changeAuthorization(url, connectValue, callBack) {
     this.#koniState.getAuthorize(value => {
       assert(value[url], 'The source is not known');
-      const nonReadonlyAccounts = this.getNonReadonlyAccounts();
-      const targetAccounts = this.filterAccountsByAccountAuthType(nonReadonlyAccounts, value[url].accountAuthType);
+      const accounts = this.getAccounts();
+      const targetAccounts = this.filterAccountsByAccountAuthType(accounts, value[url].accountAuthType);
       targetAccounts.forEach(address => {
         value[url].isAllowedMap[address] = connectValue;
       });
@@ -3219,6 +3219,32 @@ export default class KoniExtension {
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
+  WCNotSupportSubscribe(id, port) {
+    const cb = createSubscription(id, port);
+    const subscription = this.#koniState.requestService.notSupportWCSubject.subscribe(requests => cb(requests));
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+      subscription.unsubscribe();
+    });
+    return this.#koniState.requestService.allNotSupportWCRequests;
+  }
+  approveWalletConnectNotSupport({
+    id
+  }) {
+    const request = this.#koniState.requestService.getNotSupportWCRequest(id);
+    request.resolve();
+    return true;
+  }
+  rejectWalletConnectNotSupport({
+    id
+  }) {
+    const request = this.#koniState.requestService.getNotSupportWCRequest(id);
+    request.reject(new Error('USER_REJECTED'));
+    return true;
+  }
+
+  /// Manta
+
   async enableMantaPay({
     address,
     password
@@ -3743,7 +3769,7 @@ export default class KoniExtension {
       /// Wallet Connect
       case 'pri(walletConnect.connect)':
         return this.connectWalletConnect(request);
-      case 'pri(walletConnect.requests.subscribe)':
+      case 'pri(walletConnect.requests.connect.subscribe)':
         return this.connectWCSubscribe(id, port);
       case 'pri(walletConnect.session.approve)':
         return this.approveWalletConnectSession(request);
@@ -3753,6 +3779,16 @@ export default class KoniExtension {
         return this.subscribeWalletConnectSessions(id, port);
       case 'pri(walletConnect.session.disconnect)':
         return this.disconnectWalletConnectSession(request);
+
+      // Not support
+      case 'pri(walletConnect.requests.notSupport.subscribe)':
+        return this.WCNotSupportSubscribe(id, port);
+      case 'pri(walletConnect.notSupport.approve)':
+        return this.approveWalletConnectNotSupport(request);
+      case 'pri(walletConnect.notSupport.reject)':
+        return this.rejectWalletConnectNotSupport(request);
+
+      // Manta
       case 'pri(mantaPay.enable)':
         return await this.enableMantaPay(request);
       case 'pri(mantaPay.initSyncMantaPay)':

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

@@ -3,6 +3,7 @@ import { AuthUrlInfo } from '@subwallet/extension-base/background/handlers/State
 import { RequestAddPspToken } from '@subwallet/extension-base/background/KoniTypes';
 import { MessageTypes, RequestTypes, ResponseTypes } from '@subwallet/extension-base/background/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { RequestArguments } from 'web3-core';
 export declare const chainPatrolCheckUrl: (url: string) => Promise<boolean>;
 export default class KoniTabs {
@@ -26,9 +27,10 @@ export default class KoniTabs {
     protected redirectIfPhishing(url: string): Promise<boolean>;
     private cancelSubscription;
     private createUnsubscriptionHandle;
-    getAuthInfo(url: string): Promise<AuthUrlInfo | undefined>;
+    getAuthInfo(url: string, fromList?: AuthUrls): Promise<AuthUrlInfo | undefined>;
     private accountsListV2;
     private accountsSubscribeV2;
+    private accountsUnsubscribe;
     private authorizeV2;
     private getEvmCurrentAccount;
     private getEvmState;

package/koni/background/handlers/Tabs.js

@@ -77,6 +77,7 @@ export const chainPatrolCheckUrl = async url => {
   return data.status === 'BLOCKED';
 };
 export default class KoniTabs {
+  #accountSubs = {};
   #koniState;
   evmEventEmitterMap = {};
   #chainPatrolService = DEFAULT_CHAIN_PATROL_ENABLE;
@@ -105,17 +106,25 @@ export default class KoniTabs {
     assert(pair, 'Unable to find keypair');
     return pair;
   }
-  bytesSign(url, request) {
+  async bytesSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
+      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
+    }
     return this.#koniState.sign(url, new RequestBytesSign(request), {
       address,
       ...pair.meta
     });
   }
-  extrinsicSign(url, request) {
+  async extrinsicSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
+      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
+    }
     return this.#koniState.sign(url, new RequestExtrinsicSign(request), {
       address,
       ...pair.meta
@@ -217,8 +226,8 @@ export default class KoniTabs {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.#koniState.createUnsubscriptionHandle(id, unsubscribe);
   }
-  async getAuthInfo(url) {
-    const authList = await this.#koniState.getAuthList();
+  async getAuthInfo(url, fromList) {
+    const authList = fromList || (await this.#koniState.getAuthList());
     const shortenUrl = stripUrl(url);
     return authList[shortenUrl];
   }
@@ -233,15 +242,35 @@ export default class KoniTabs {
     accountAuthType
   }, id, port) {
     const cb = createSubscription(id, port);
-    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
-      this.getAuthInfo(url).then(authInfo => {
-        cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
-      }).catch(console.error);
-    });
-    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    const authInfoSubject = this.#koniState.requestService.subscribeAuthorizeUrlSubject;
+
+    // Update unsubscribe from @polkadot/extension-base
+    this.#accountSubs[id] = {
+      subscription: authInfoSubject.subscribe(infos => {
+        this.getAuthInfo(url, infos).then(authInfo => {
+          const accounts = this.#koniState.keyringService.accounts;
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
+        }).catch(console.error);
+      }),
+      url
+    };
     port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
+      this.accountsUnsubscribe(url, {
+        id
+      });
     });
+    return id;
+  }
+  accountsUnsubscribe(url, {
+    id
+  }) {
+    const sub = this.#accountSubs[id];
+    if (!sub || sub.url !== url) {
+      return false;
+    }
+    delete this.#accountSubs[id];
+    unsubscribe(id);
+    sub.subscription.unsubscribe();
     return true;
   }
   authorizeV2(url, request) {
@@ -897,6 +926,8 @@ export default class KoniTabs {
         return this.metadataList(url);
       case 'pub(metadata.provide)':
         return this.metadataProvide(url, request);
+      case 'pub(ping)':
+        return Promise.resolve(true);
       case 'pub(rpc.listProviders)':
         return this.rpcListProviders();
       case 'pub(rpc.send)':
@@ -919,6 +950,8 @@ export default class KoniTabs {
         return this.accountsListV2(url, request);
       case 'pub(accounts.subscribeV2)':
         return this.accountsSubscribeV2(url, request, id, port);
+      case 'pub(accounts.unsubscribe)':
+        return this.accountsUnsubscribe(url, request);
       case 'evm(events.subscribe)':
         return await this.evmSubscribeEvents(url, id, port);
       case 'evm(request)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.4-0",
+  "version": "1.1.6-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -720,11 +720,21 @@
       "require": "./cjs/services/request-service/constants.js",
       "default": "./services/request-service/constants.js"
     },
+    "./services/request-service/handler": {
+      "types": "./services/request-service/handler/index.d.ts",
+      "require": "./cjs/services/request-service/handler/index.js",
+      "default": "./services/request-service/handler/index.js"
+    },
     "./services/request-service/handler/AuthRequestHandler": {
       "types": "./services/request-service/handler/AuthRequestHandler.d.ts",
       "require": "./cjs/services/request-service/handler/AuthRequestHandler.js",
       "default": "./services/request-service/handler/AuthRequestHandler.js"
     },
+    "./services/request-service/handler/ConnectWCRequestHandler": {
+      "types": "./services/request-service/handler/ConnectWCRequestHandler.d.ts",
+      "require": "./cjs/services/request-service/handler/ConnectWCRequestHandler.js",
+      "default": "./services/request-service/handler/ConnectWCRequestHandler.js"
+    },
     "./services/request-service/handler/EvmRequestHandler": {
       "types": "./services/request-service/handler/EvmRequestHandler.d.ts",
       "require": "./cjs/services/request-service/handler/EvmRequestHandler.js",
@@ -735,6 +745,11 @@
       "require": "./cjs/services/request-service/handler/MetadataRequestHandler.js",
       "default": "./services/request-service/handler/MetadataRequestHandler.js"
     },
+    "./services/request-service/handler/NotSupportWCRequestHandler": {
+      "types": "./services/request-service/handler/NotSupportWCRequestHandler.d.ts",
+      "require": "./cjs/services/request-service/handler/NotSupportWCRequestHandler.js",
+      "default": "./services/request-service/handler/NotSupportWCRequestHandler.js"
+    },
     "./services/request-service/handler/PopupHandler": {
       "types": "./services/request-service/handler/PopupHandler.d.ts",
       "require": "./cjs/services/request-service/handler/PopupHandler.js",
@@ -745,11 +760,6 @@
       "require": "./cjs/services/request-service/handler/SubstrateRequestHandler.js",
       "default": "./services/request-service/handler/SubstrateRequestHandler.js"
     },
-    "./services/request-service/handler/WalletConnectRequestHandler": {
-      "types": "./services/request-service/handler/WalletConnectRequestHandler.d.ts",
-      "require": "./cjs/services/request-service/handler/WalletConnectRequestHandler.js",
-      "default": "./services/request-service/handler/WalletConnectRequestHandler.js"
-    },
     "./services/request-service/helper": {
       "types": "./services/request-service/helper/index.d.ts",
       "require": "./cjs/services/request-service/helper/index.js",
@@ -1173,11 +1183,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.7",
-    "@subwallet/extension-base": "^1.1.4-0",
-    "@subwallet/extension-chains": "^1.1.4-0",
-    "@subwallet/extension-dapp": "^1.1.4-0",
-    "@subwallet/extension-inject": "^1.1.4-0",
+    "@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/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1202,7 +1212,7 @@
     "json-rpc-engine": "^6.1.0",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
-    "protobufjs": "^7.1.2",
+    "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
     "web3": "^1.10.0",
     "web3-core": "^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.4-0'
+  version: '1.1.6-0'
 };

package/page/Accounts.js

@@ -14,11 +14,16 @@ export default class Accounts {
     });
   }
   subscribe(cb) {
+    let id = null;
     sendRequest('pub(accounts.subscribeV2)', {
       accountAuthType: 'substrate'
-    }, cb).catch(error => console.error(error));
+    }, cb).then(subId => {
+      id = subId;
+    }).catch(console.error);
     return () => {
-      // FIXME we need the ability to unsubscribe
+      id && sendRequest('pub(accounts.unsubscribe)', {
+        id
+      }).catch(console.error);
     };
   }
 }

package/page/Injected.js

@@ -11,5 +11,10 @@ export default class {
     this.metadata = new Metadata(sendRequest);
     this.provider = new PostMessageProvider(sendRequest);
     this.signer = new Signer(sendRequest);
+    setInterval(() => {
+      sendRequest('pub(ping)', null).catch(() => {
+        console.error('Extension unavailable, ping failed');
+      });
+    }, 5000 + Math.floor(Math.random() * 5000));
   }
 }

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -5,7 +5,7 @@ import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 export default class AuthRequestHandler {
     #private;
     private keyringService;
@@ -31,8 +31,8 @@ export default class AuthRequestHandler {
     private authCompleteV2;
     authorizeUrlV2(url: string, request: RequestAuthorizeTab): Promise<boolean>;
     getAuthRequestV2(id: string): AuthRequestV2;
-    get subscribeEvmChainChange(): Subject<AuthUrls>;
-    get subscribeAuthorizeUrlSubject(): Subject<AuthUrls>;
+    get subscribeEvmChainChange(): BehaviorSubject<AuthUrls>;
+    get subscribeAuthorizeUrlSubject(): BehaviorSubject<AuthUrls>;
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
     resetWallet(): void;
 }