@subwallet/extension-base 1.1.3-0 → 1.1.5-0

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

@@ -0,0 +1,62 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { BehaviorSubject } from 'rxjs';
+
+// WC = WalletConnect
+export default class NotSupportWCRequestHandler {
+  #requestService;
+  #notSupportWCRequests = {};
+  notSupportWCSubject = new BehaviorSubject([]);
+  constructor(requestService) {
+    this.#requestService = requestService;
+  }
+  get allNotSupportWCRequests() {
+    return Object.values(this.#notSupportWCRequests)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    .map(({
+      reject,
+      resolve,
+      ...data
+    }) => data);
+  }
+  get numNotSupportWCRequests() {
+    return Object.keys(this.#notSupportWCRequests).length;
+  }
+  getNotSupportWCRequest(id) {
+    return this.#notSupportWCRequests[id];
+  }
+  updateIconNotSupportWC(shouldClose) {
+    this.notSupportWCSubject.next(this.allNotSupportWCRequests);
+    this.#requestService.updateIconV2(shouldClose);
+  }
+  notSupportWCComplete = id => {
+    const complete = shouldClose => {
+      delete this.#notSupportWCRequests[id];
+      this.updateIconNotSupportWC(shouldClose);
+    };
+    return {
+      reject: () => {
+        complete(true);
+      },
+      resolve: () => {
+        complete(true);
+      }
+    };
+  };
+  addNotSupportWCRequest(request) {
+    const id = request.id;
+    this.#notSupportWCRequests[id] = {
+      ...this.notSupportWCComplete(id),
+      ...request
+    };
+    this.updateIconNotSupportWC();
+    this.#requestService.popupOpen();
+  }
+  resetWallet() {
+    for (const request of Object.values(this.#notSupportWCRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.notSupportWCSubject.next([]);
+  }
+}

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

@@ -0,0 +1,7 @@
+export { default as AuthRequestHandler } from './AuthRequestHandler';
+export { default as ConnectWCRequestHandler } from './ConnectWCRequestHandler';
+export { default as EvmRequestHandler } from './EvmRequestHandler';
+export { default as MetadataRequestHandler } from './MetadataRequestHandler';
+export { default as NotSupportWCRequestHandler } from './NotSupportWCRequestHandler';
+export { default as PopupHandler } from './PopupHandler';
+export { default as SubstrateRequestHandler } from './SubstrateRequestHandler';

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

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as AuthRequestHandler } from "./AuthRequestHandler.js";
+export { default as ConnectWCRequestHandler } from "./ConnectWCRequestHandler.js";
+export { default as EvmRequestHandler } from "./EvmRequestHandler.js";
+export { default as MetadataRequestHandler } from "./MetadataRequestHandler.js";
+export { default as NotSupportWCRequestHandler } from "./NotSupportWCRequestHandler.js";
+export { default as PopupHandler } from "./PopupHandler.js";
+export { default as SubstrateRequestHandler } from "./SubstrateRequestHandler.js";

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

@@ -2,12 +2,12 @@ import { AuthRequestV2, ConfirmationDefinitions, ConfirmationsQueue, Confirmatio
 import { AccountAuthType, AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestSign, ResponseSigning, SigningRequest } from '@subwallet/extension-base/background/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
-import { AuthUrls, MetaRequest } from '@subwallet/extension-base/services/request-service/types';
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
-import { WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
+import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { MetadataDef } from '@subwallet/extension-inject/types';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { SignerPayloadJSON } from '@polkadot/types/types/extrinsic';
+import { AuthUrls, MetaRequest } from './types';
 export default class RequestService {
     #private;
     private keyringService;
@@ -38,8 +38,8 @@ export default class RequestService {
         defaultChain?: string;
         url?: string;
     }): import("@subwallet/chain-list/types")._ChainInfo | undefined;
-    get subscribeEvmChainChange(): Subject<AuthUrls>;
-    get subscribeAuthorizeUrlSubject(): Subject<AuthUrls>;
+    get subscribeEvmChainChange(): BehaviorSubject<AuthUrls>;
+    get subscribeAuthorizeUrlSubject(): BehaviorSubject<AuthUrls>;
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
     get signSubject(): BehaviorSubject<SigningRequest[]>;
     get allSubstrateRequests(): SigningRequest[];
@@ -47,7 +47,7 @@ export default class RequestService {
     get numSubstrateRequests(): number;
     get numEvmRequests(): number;
     get confirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
-    getSignRequest(id: string): import("@subwallet/extension-base/services/request-service/types").SignRequest | undefined;
+    getSignRequest(id: string): import("./types").SignRequest | undefined;
     signInternalTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
     addConfirmation<CT extends ConfirmationType>(id: string, url: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): Promise<ConfirmationDefinitions[CT][1]>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
@@ -57,6 +57,11 @@ export default class RequestService {
     get allConnectWCRequests(): WalletConnectSessionRequest[];
     get numConnectWCRequests(): number;
     addConnectWCRequest(request: WalletConnectSessionRequest): void;
+    getNotSupportWCRequest(id: string): import("@subwallet/extension-base/services/wallet-connect-service/types").RequestWalletConnectNotSupport;
+    get notSupportWCSubject(): BehaviorSubject<WalletConnectNotSupportRequest[]>;
+    get allNotSupportWCRequests(): WalletConnectNotSupportRequest[];
+    get numNotSupportWCRequests(): number;
+    addNotSupportWCRequest(request: WalletConnectNotSupportRequest): void;
     get numRequests(): number;
     resetWallet(): void;
 }

package/services/request-service/index.js

@@ -1,12 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import AuthRequestHandler from '@subwallet/extension-base/services/request-service/handler/AuthRequestHandler';
-import EvmRequestHandler from '@subwallet/extension-base/services/request-service/handler/EvmRequestHandler';
-import MetadataRequestHandler from '@subwallet/extension-base/services/request-service/handler/MetadataRequestHandler';
-import PopupHandler from '@subwallet/extension-base/services/request-service/handler/PopupHandler';
-import SubstrateRequestHandler from '@subwallet/extension-base/services/request-service/handler/SubstrateRequestHandler';
-import WalletConnectRequestHandler from '@subwallet/extension-base/services/request-service/handler/WalletConnectRequestHandler';
+import { AuthRequestHandler, ConnectWCRequestHandler, EvmRequestHandler, MetadataRequestHandler, NotSupportWCRequestHandler, PopupHandler, SubstrateRequestHandler } from "./handler/index.js";
 export default class RequestService {
   // Common
   #chainService;
@@ -15,7 +10,8 @@ export default class RequestService {
   #authRequestHandler;
   #substrateRequestHandler;
   #evmRequestHandler;
-  #walletConnectRequestHandler;
+  #connectWCRequestHandler;
+  #notSupportWCRequestHandler;
 
   // Common
   constructor(chainService, settingService, keyringService) {
@@ -27,7 +23,8 @@ export default class RequestService {
     this.#authRequestHandler = new AuthRequestHandler(this, this.#chainService, this.keyringService);
     this.#substrateRequestHandler = new SubstrateRequestHandler(this);
     this.#evmRequestHandler = new EvmRequestHandler(this);
-    this.#walletConnectRequestHandler = new WalletConnectRequestHandler(this);
+    this.#connectWCRequestHandler = new ConnectWCRequestHandler(this);
+    this.#notSupportWCRequestHandler = new NotSupportWCRequestHandler(this);
 
     // Reset icon on start service
     this.updateIconV2();
@@ -158,32 +155,50 @@ export default 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();
   }
 }

package/services/transaction-service/index.js

@@ -18,6 +18,7 @@ import { anyNumberToBN } from '@subwallet/extension-base/utils/eth';
 import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import keyring from '@subwallet/ui-keyring';
+import BigN from 'bignumber.js';
 import { addHexPrefix } from 'ethereumjs-util';
 import { ethers } from 'ethers';
 import EventEmitter from 'eventemitter3';
@@ -113,7 +114,7 @@ export default 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(BasicTxErrorType.NOT_ENOUGH_BALANCE));
           }
           estimateFee.value = '0';
@@ -142,6 +143,9 @@ export default class TransactionService {
     const balanceNum = parseInt(balance.value);
     const edNum = parseInt(existentialDeposit);
     const transferNativeNum = parseInt(transferNative);
+    if (!new BigN(balance.value).gt(0)) {
+      validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));
+    }
     if (transferNativeNum + feeNum > balanceNum) {
       if (!isTransferAll) {
         validationResponse.errors.push(new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE));

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

@@ -1,9 +1,10 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { SignClientTypes } from '@walletconnect/types';
 import { ProposalTypes } from '@walletconnect/types/dist/types/sign-client/proposal';
-import { EIP155_SIGNING_METHODS, WalletConnectParamMap, WalletConnectSessionRequest, WalletConnectSigningMethod } from './types';
+import { EIP155_SIGNING_METHODS, WalletConnectNotSupportRequest, WalletConnectParamMap, WalletConnectSessionRequest, WalletConnectSigningMethod } from './types';
 export declare const getWCId: (id: number) => string;
 export declare const convertConnectRequest: (request: SignClientTypes.EventArguments['session_proposal']) => WalletConnectSessionRequest;
+export declare const convertNotSupportRequest: (request: SignClientTypes.EventArguments['session_request'], url: string) => WalletConnectNotSupportRequest;
 export declare const parseRequestParams: <T extends WalletConnectSigningMethod>(params: unknown) => WalletConnectParamMap[T];
 export declare const getEip155MessageAddress: (method: EIP155_SIGNING_METHODS, param: unknown) => string;
 export declare const isWalletConnectRequest: (id?: string) => boolean;

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

@@ -16,6 +16,14 @@ export const convertConnectRequest = request => {
     url: request.params.proposer.metadata.url
   };
 };
+export const convertNotSupportRequest = (request, url) => {
+  return {
+    id: getWCId(request.id),
+    isInternal: false,
+    request: request,
+    url: url
+  };
+};
 export const parseRequestParams = params => {
   // @ts-ignore
   return params;

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

@@ -10,7 +10,7 @@ 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 { convertConnectRequest, isSupportWalletConnectChain } from "./helpers.js";
+import { convertConnectRequest, convertNotSupportRequest, isSupportWalletConnectChain } from "./helpers.js";
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from "./types.js";
 var _requestService = /*#__PURE__*/_classPrivateFieldLooseKey("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("polkadotRequestHandler");
@@ -251,6 +251,11 @@ function _onSessionRequest2(requestEvent) {
     }
   } catch (e) {
     console.log(e);
+    try {
+      const requestSession = this.getSession(topic);
+      const notSupportRequest = convertNotSupportRequest(requestEvent, requestSession.peer.metadata.url);
+      _classPrivateFieldLooseBase(this, _requestService)[_requestService].addNotSupportWCRequest(notSupportRequest);
+    } catch (e) {}
     this.responseRequest({
       topic: topic,
       response: formatJsonRpcError(id, e.message)

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

@@ -5,9 +5,14 @@ import { SignerPayloadJSON } from '@polkadot/types/types';
 export interface WalletConnectSessionRequest extends ConfirmationRequestBase {
     request: SignClientTypes.EventArguments['session_proposal'];
 }
+export interface WalletConnectNotSupportRequest extends ConfirmationRequestBase {
+    request: SignClientTypes.EventArguments['session_request'];
+}
 export declare type ResultApproveWalletConnectSession = EngineTypes.ApproveParams;
 export interface RequestWalletConnectSession extends WalletConnectSessionRequest, Resolver<void> {
 }
+export interface RequestWalletConnectNotSupport extends WalletConnectNotSupportRequest, Resolver<void> {
+}
 export declare enum EIP155_SIGNING_METHODS {
     PERSONAL_SIGN = "personal_sign",
     ETH_SIGN = "eth_sign",