@subwallet/extension-base 1.1.52-0 → 1.1.53-0

package/cjs/packageInfo.js

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

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -98,7 +98,8 @@ const subscribeWithSystemAccountPallet = async _ref => {
   if ((0, _utils2._isSubstrateRelayChain)(chainInfo) && substrateApi.query.nominationPools) {
     var _substrateApi$rx$quer;
     poolSubscribe = (_substrateApi$rx$quer = substrateApi.rx.query.nominationPools.poolMembers) === null || _substrateApi$rx$quer === void 0 ? void 0 : _substrateApi$rx$quer.multi(addresses);
-  } else {
+  }
+  if (!poolSubscribe) {
     poolSubscribe = new _rxjs.Observable(subscriber => {
       subscriber.next(addresses.map(() => ({
         toPrimitive() {

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

@@ -59,7 +59,6 @@ class ConnectWCRequestHandler {
       ...request
     };
     this.updateIconConnectWC();
-    this.#requestService.popupOpen();
   }
   resetWallet() {
     for (const request of Object.values(this.#connectWCRequests)) {

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

@@ -18,7 +18,7 @@ exports.getWCId = getWCId;
 const convertConnectRequest = request => {
   return {
     id: getWCId(request.id),
-    isInternal: false,
+    isInternal: true,
     request: request,
     url: request.params.proposer.metadata.url
   };

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

@@ -21,6 +21,8 @@ var _types = require("./types");
 // SPDX-License-Identifier: Apache-2.0
 
 const storage = _storage.SWStorage.instance;
+const methodDOTRequire = [_types.POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_MESSAGE, _types.POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_TRANSACTION];
+const methodEVMRequire = [_types.EIP155_SIGNING_METHODS.PERSONAL_SIGN, _types.EIP155_SIGNING_METHODS.ETH_SIGN, _types.EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION];
 var _requestService = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("eip155RequestHandler");
@@ -125,6 +127,13 @@ class WalletConnectService {
   async approveSession(result) {
     var _classPrivateFieldLoo4;
     (0, _classPrivateFieldLooseBase2.default)(this, _checkClient)[_checkClient]();
+    Object.entries(result.namespaces).forEach(_ref => {
+      let [namespace, {
+        methods
+      }] = _ref;
+      methods = [...methods, ...this.findMethodsMissing(_constants.WALLET_CONNECT_EIP155_NAMESPACE === namespace ? methodEVMRequire : methodDOTRequire, methods)];
+      result.namespaces[namespace].methods = methods;
+    });
     await ((_classPrivateFieldLoo4 = (0, _classPrivateFieldLooseBase2.default)(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.approve(result));
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
@@ -193,6 +202,16 @@ class WalletConnectService {
     }));
     (0, _classPrivateFieldLooseBase2.default)(this, _updateSessions)[_updateSessions]();
   }
+  findMethodsMissing(methodRequire, methods) {
+    const methodMap = methods.reduce((obj, m) => ({
+      ...obj,
+      [m]: m
+    }), {});
+    return methodEVMRequire.reduce((methods, m) => {
+      !methodMap[m] && methods.push(m);
+      return methods;
+    }, []);
+  }
 }
 exports.default = WalletConnectService;
 function _get_haveData() {

package/cjs/utils/eth/parseTransaction/index.js

@@ -93,8 +93,8 @@ const parseResult = (type, input, name) => {
     };
   } else {
     return {
-      type: types,
       name: genName(name),
+      type: types,
       value: genInput(input)
     };
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.52-0",
+  "version": "1.1.53-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1817,10 +1817,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.54",
-    "@subwallet/extension-base": "^1.1.52-0",
-    "@subwallet/extension-chains": "^1.1.52-0",
-    "@subwallet/extension-dapp": "^1.1.52-0",
-    "@subwallet/extension-inject": "^1.1.52-0",
+    "@subwallet/extension-base": "^1.1.53-0",
+    "@subwallet/extension-chains": "^1.1.53-0",
+    "@subwallet/extension-dapp": "^1.1.53-0",
+    "@subwallet/extension-inject": "^1.1.53-0",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.52-0'
+  version: '1.1.53-0'
 };

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -90,7 +90,8 @@ const subscribeWithSystemAccountPallet = async ({
   if (_isSubstrateRelayChain(chainInfo) && substrateApi.query.nominationPools) {
     var _substrateApi$rx$quer;
     poolSubscribe = (_substrateApi$rx$quer = substrateApi.rx.query.nominationPools.poolMembers) === null || _substrateApi$rx$quer === void 0 ? void 0 : _substrateApi$rx$quer.multi(addresses);
-  } else {
+  }
+  if (!poolSubscribe) {
     poolSubscribe = new Observable(subscriber => {
       subscriber.next(addresses.map(() => ({
         toPrimitive() {

package/services/request-service/handler/ConnectWCRequestHandler.js

@@ -51,7 +51,6 @@ export default class ConnectWCRequestHandler {
       ...request
     };
     this.updateIconConnectWC();
-    this.#requestService.popupOpen();
   }
   resetWallet() {
     for (const request of Object.values(this.#connectWCRequests)) {

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

@@ -11,7 +11,7 @@ export const getWCId = id => {
 export const convertConnectRequest = request => {
   return {
     id: getWCId(request.id),
-    isInternal: false,
+    isInternal: true,
     request: request,
     url: request.params.proposer.metadata.url
   };

package/services/wallet-connect-service/index.d.ts

@@ -16,4 +16,5 @@ export default class WalletConnectService {
     responseRequest(response: EngineTypes.RespondParams): Promise<void>;
     resetWallet(resetAll: boolean): Promise<void>;
     disconnect(topic: string): Promise<void>;
+    private findMethodsMissing;
 }

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

@@ -10,10 +10,12 @@ import SignClient from '@walletconnect/sign-client';
 import { getInternalError, getSdkError } from '@walletconnect/utils';
 import { BehaviorSubject } from 'rxjs';
 import PolkadotRequestHandler from "./handler/PolkadotRequestHandler.js";
-import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
+import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
 import { convertConnectRequest, convertNotSupportRequest, isSupportWalletConnectChain } from "./helpers.js";
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from "./types.js";
 const storage = SWStorage.instance;
+const methodDOTRequire = [POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_MESSAGE, POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_TRANSACTION];
+const methodEVMRequire = [EIP155_SIGNING_METHODS.PERSONAL_SIGN, EIP155_SIGNING_METHODS.ETH_SIGN, EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION];
 var _requestService = /*#__PURE__*/_classPrivateFieldLooseKey("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("eip155RequestHandler");
@@ -117,6 +119,12 @@ export default class WalletConnectService {
   async approveSession(result) {
     var _classPrivateFieldLoo4;
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
+    Object.entries(result.namespaces).forEach(([namespace, {
+      methods
+    }]) => {
+      methods = [...methods, ...this.findMethodsMissing(WALLET_CONNECT_EIP155_NAMESPACE === namespace ? methodEVMRequire : methodDOTRequire, methods)];
+      result.namespaces[namespace].methods = methods;
+    });
     await ((_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.approve(result));
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
@@ -185,6 +193,16 @@ export default class WalletConnectService {
     }));
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
+  findMethodsMissing(methodRequire, methods) {
+    const methodMap = methods.reduce((obj, m) => ({
+      ...obj,
+      [m]: m
+    }), {});
+    return methodEVMRequire.reduce((methods, m) => {
+      !methodMap[m] && methods.push(m);
+      return methods;
+    }, []);
+  }
 }
 function _get_haveData() {
   const sessionStorage = storage.getItem('wc@2:client:0.3//session');

package/utils/eth/parseTransaction/index.js

@@ -87,8 +87,8 @@ const parseResult = (type, input, name) => {
     };
   } else {
     return {
-      type: types,
       name: genName(name),
+      type: types,
       value: genInput(input)
     };
   }