@subwallet/extension-base 1.0.11-2 → 1.0.13-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.11-2",
+  "version": "1.0.13-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -655,6 +655,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateChainPatrol.js",
       "default": "./services/migration-service/scripts/MigrateChainPatrol.js"
     },
+    "./services/migration-service/scripts/MigrateEthProvider": {
+      "types": "./services/migration-service/scripts/MigrateEthProvider.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateEthProvider.js",
+      "default": "./services/migration-service/scripts/MigrateEthProvider.js"
+    },
     "./services/migration-service/scripts/MigrateImportedToken": {
       "types": "./services/migration-service/scripts/MigrateImportedToken.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateImportedToken.js",
@@ -730,6 +735,11 @@
       "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",
@@ -895,6 +905,36 @@
       "require": "./cjs/services/transaction-service/utils.js",
       "default": "./services/transaction-service/utils.js"
     },
+    "./services/wallet-connect-service": {
+      "types": "./services/wallet-connect-service/index.d.ts",
+      "require": "./cjs/services/wallet-connect-service/index.js",
+      "default": "./services/wallet-connect-service/index.js"
+    },
+    "./services/wallet-connect-service/constants": {
+      "types": "./services/wallet-connect-service/constants.d.ts",
+      "require": "./cjs/services/wallet-connect-service/constants.js",
+      "default": "./services/wallet-connect-service/constants.js"
+    },
+    "./services/wallet-connect-service/handler/Eip155RequestHandler": {
+      "types": "./services/wallet-connect-service/handler/Eip155RequestHandler.d.ts",
+      "require": "./cjs/services/wallet-connect-service/handler/Eip155RequestHandler.js",
+      "default": "./services/wallet-connect-service/handler/Eip155RequestHandler.js"
+    },
+    "./services/wallet-connect-service/handler/PolkadotRequestHandler": {
+      "types": "./services/wallet-connect-service/handler/PolkadotRequestHandler.d.ts",
+      "require": "./cjs/services/wallet-connect-service/handler/PolkadotRequestHandler.js",
+      "default": "./services/wallet-connect-service/handler/PolkadotRequestHandler.js"
+    },
+    "./services/wallet-connect-service/helpers": {
+      "types": "./services/wallet-connect-service/helpers.d.ts",
+      "require": "./cjs/services/wallet-connect-service/helpers.js",
+      "default": "./services/wallet-connect-service/helpers.js"
+    },
+    "./services/wallet-connect-service/types": {
+      "types": "./services/wallet-connect-service/types.d.ts",
+      "require": "./cjs/services/wallet-connect-service/types.js",
+      "default": "./services/wallet-connect-service/types.js"
+    },
     "./signers/substrates/KeyringSigner": {
       "types": "./signers/substrates/KeyringSigner.d.ts",
       "require": "./cjs/signers/substrates/KeyringSigner.js",
@@ -1015,11 +1055,21 @@
       "require": "./cjs/utils/address.js",
       "default": "./utils/address.js"
     },
+    "./utils/array": {
+      "types": "./utils/array.d.ts",
+      "require": "./cjs/utils/array.js",
+      "default": "./utils/array.js"
+    },
     "./utils/canDerive": {
       "types": "./utils/canDerive.d.ts",
       "require": "./cjs/utils/canDerive.js",
       "default": "./utils/canDerive.js"
     },
+    "./utils/environment": {
+      "types": "./utils/environment.d.ts",
+      "require": "./cjs/utils/environment.js",
+      "default": "./utils/environment.js"
+    },
     "./utils/eth": {
       "types": "./utils/eth.d.ts",
       "require": "./cjs/utils/eth.js",
@@ -1073,32 +1123,36 @@
     "@ethereumjs/common": "^2.6.5",
     "@ethereumjs/tx": "^4.0.2",
     "@ethersproject/abi": "^5.7.0",
+    "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
-    "@polkadot/api": "^10.7.2",
-    "@polkadot/api-contract": "^10.7.2",
-    "@polkadot/api-derive": "^10.7.2",
-    "@polkadot/apps-config": "^0.131.4",
-    "@polkadot/hw-ledger": "^12.2.1",
-    "@polkadot/networks": "^12.2.1",
+    "@polkadot/api": "^10.9.1",
+    "@polkadot/api-contract": "^10.9.1",
+    "@polkadot/api-derive": "^10.9.1",
+    "@polkadot/apps-config": "^0.132.1",
+    "@polkadot/hw-ledger": "^12.3.2",
+    "@polkadot/networks": "^12.3.2",
     "@polkadot/phishing": "^0.21.5",
-    "@polkadot/rpc-provider": "^10.7.2",
-    "@polkadot/types": "^10.7.2",
-    "@polkadot/types-augment": "^10.7.2",
-    "@polkadot/ui-settings": "^3.4.1",
-    "@polkadot/util": "^12.2.1",
-    "@polkadot/util-crypto": "^12.2.1",
+    "@polkadot/rpc-provider": "^10.9.1",
+    "@polkadot/types": "^10.9.1",
+    "@polkadot/types-augment": "^10.9.1",
+    "@polkadot/ui-settings": "^3.5.1",
+    "@polkadot/util": "^12.3.2",
+    "@polkadot/util-crypto": "^12.3.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.2",
-    "@subwallet/extension-base": "^1.0.11-2",
-    "@subwallet/extension-chains": "^1.0.11-2",
-    "@subwallet/extension-dapp": "^1.0.11-2",
-    "@subwallet/extension-inject": "^1.0.11-2",
+    "@subwallet/chain-list": "^0.2.4",
+    "@subwallet/extension-base": "^1.0.13-0",
+    "@subwallet/extension-chains": "^1.0.13-0",
+    "@subwallet/extension-dapp": "^1.0.13-0",
+    "@subwallet/extension-inject": "^1.0.13-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
+    "@walletconnect/sign-client": "^2.8.4",
+    "@walletconnect/types": "^2.8.4",
+    "@walletconnect/utils": "^2.8.4",
     "axios": "^1.2.1",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.1",

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

package/page/Metadata.d.ts

@@ -1,7 +1,9 @@
 import type { InjectedMetadata, InjectedMetadataKnown, MetadataDef } from '@subwallet/extension-inject/types';
 import type { SendRequest } from './types';
+import { RequestAddPspToken } from '@subwallet/extension-base/background/KoniTypes';
 export default class Metadata implements InjectedMetadata {
     constructor(_sendRequest: SendRequest);
     get(): Promise<InjectedMetadataKnown[]>;
     provide(definition: MetadataDef): Promise<boolean>;
+    addToken(request: RequestAddPspToken): Promise<boolean>;
 }

package/page/Metadata.js

@@ -13,4 +13,7 @@ export default class Metadata {
   provide(definition) {
     return sendRequest('pub(metadata.provide)', definition);
   }
+  addToken(request) {
+    return sendRequest('pub(token.add)', request);
+  }
 }

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

@@ -63,3 +63,5 @@ export declare function _isAssetFungibleToken(chainAsset: _ChainAsset): boolean;
 export declare function _getCrowdloanUrlFromChain(chainInfo: _ChainInfo): string;
 export declare function _isCustomProvider(providerKey: string): boolean;
 export declare function _generateCustomProviderKey(index: number): string;
+export declare const findChainInfoByHalfGenesisHash: (chainMap: Record<string, _ChainInfo>, halfGenesisHash?: string) => _ChainInfo | null;
+export declare const findChainInfoByChainId: (chainMap: Record<string, _ChainInfo>, chainId?: number) => _ChainInfo | null;

package/services/chain-service/utils.js

@@ -330,4 +330,28 @@ export function _isCustomProvider(providerKey) {
 }
 export function _generateCustomProviderKey(index) {
   return `${_CUSTOM_PREFIX}provider-${index}`;
-}
+}
+export const findChainInfoByHalfGenesisHash = (chainMap, halfGenesisHash) => {
+  if (!halfGenesisHash) {
+    return null;
+  }
+  for (const chainInfo of Object.values(chainMap)) {
+    var _getSubstrateGenesisH;
+    if (((_getSubstrateGenesisH = _getSubstrateGenesisHash(chainInfo)) === null || _getSubstrateGenesisH === void 0 ? void 0 : _getSubstrateGenesisH.toLowerCase().substring(2, 2 + 32)) === halfGenesisHash.toLowerCase()) {
+      return chainInfo;
+    }
+  }
+  return null;
+};
+export const findChainInfoByChainId = (chainMap, chainId) => {
+  if (!chainId) {
+    return null;
+  }
+  for (const chainInfo of Object.values(chainMap)) {
+    var _chainInfo$evmInfo5;
+    if (((_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.evmChainId) === chainId) {
+      return chainInfo;
+    }
+  }
+  return null;
+};

package/services/migration-service/scripts/MigrateEthProvider.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateEthProvider extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateEthProvider.js

@@ -0,0 +1,24 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateEthProvider extends BaseMigrationJob {
+  async run() {
+    const state = this.state;
+    const slug = 'ethereum';
+    const oldProvider = 'Cloudflare';
+    const newProvider = 'Llamarpc';
+    const chainState = state.getChainStateByKey(slug);
+    const chainInfo = state.getChainInfo(slug);
+    if (chainState.active && chainState.currentProvider === oldProvider) {
+      await state.upsertChainInfo({
+        mode: 'update',
+        chainEditInfo: {
+          currentProvider: newProvider,
+          slug: slug,
+          providers: chainInfo.providers
+        }
+      });
+    }
+  }
+}

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

@@ -1,15 +1,16 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import AutoEnableChainsTokens from '@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens';
-import MigrateAuthUrls from '@subwallet/extension-base/services/migration-service/scripts/MigrateAuthUrls';
-import MigrateAutoLock from '@subwallet/extension-base/services/migration-service/scripts/MigrateAutoLock';
-import MigrateChainPatrol from '@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol';
-import MigrateImportedToken from '@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken';
-import MigrateLedgerAccount from '@subwallet/extension-base/services/migration-service/scripts/MigrateLedgerAccount';
-import MigrateNetworkSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings';
-import MigrateSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateSettings';
-import MigrateTransactionHistory from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistory';
+import AutoEnableChainsTokens from "./AutoEnableChainsTokens.js";
+import MigrateAuthUrls from "./MigrateAuthUrls.js";
+import MigrateAutoLock from "./MigrateAutoLock.js";
+import MigrateChainPatrol from "./MigrateChainPatrol.js";
+import MigrateEthProvider from "./MigrateEthProvider.js";
+import MigrateImportedToken from "./MigrateImportedToken.js";
+import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
+import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
+import MigrateSettings from "./MigrateSettings.js";
+import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
 export const EVERYTIME = '__everytime__';
 export default {
   '1.0.1-11': MigrateNetworkSettings,
@@ -20,6 +21,7 @@ export default {
   '1.0.1-60': MigrateAuthUrls,
   '1.0.3-01': MigrateAutoLock,
   '1.0.3-02': MigrateChainPatrol,
-  '1.0.9-01': MigrateLedgerAccount
+  '1.0.9-01': MigrateLedgerAccount,
+  '1.0.12-02': MigrateEthProvider
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

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

@@ -15,7 +15,6 @@ export default class AuthRequestHandler {
     private readonly evmChainSubject;
     readonly authSubjectV2: BehaviorSubject<AuthorizeRequest[]>;
     constructor(requestService: RequestService, chainService: ChainService, keyringService: KeyringService);
-    stripUrl(url: string): string;
     private getAddressList;
     get numAuthRequestsV2(): number;
     private get allAuthRequestsV2();

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

@@ -4,7 +4,7 @@
 import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
 import { PREDEFINED_CHAIN_DAPP_CHAIN_MAP } from '@subwallet/extension-base/services/request-service/constants';
 import AuthorizeStore from '@subwallet/extension-base/stores/Authorize';
-import { getDomainFromUrl } from '@subwallet/extension-base/utils';
+import { getDomainFromUrl, stripUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { assert } from '@polkadot/util';
@@ -24,11 +24,6 @@ export default class AuthRequestHandler {
     this.#requestService = requestService;
     this.#chainService = chainService;
   }
-  stripUrl(url) {
-    assert(url && (url.startsWith('http:') || url.startsWith('https:') || url.startsWith('ipfs:') || url.startsWith('ipns:')), `Invalid url ${url}, expected to start with http: or https: or ipfs: or ipns:`);
-    const parts = url.split('/');
-    return parts[2];
-  }
   getAddressList(value = false) {
     const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
@@ -161,7 +156,7 @@ export default class AuthRequestHandler {
         if (value) {
           authorizeList = value;
         }
-        const existed = authorizeList[this.stripUrl(url)];
+        const existed = authorizeList[stripUrl(url)];
 
         // On cancel don't save anything
         if (isCancelled) {
@@ -170,7 +165,7 @@ export default class AuthRequestHandler {
           cb();
           return;
         }
-        authorizeList[this.stripUrl(url)] = {
+        authorizeList[stripUrl(url)] = {
           count: 0,
           id: idStr,
           isAllowed,
@@ -210,7 +205,7 @@ export default class AuthRequestHandler {
     if (!authList) {
       authList = {};
     }
-    const idStr = this.stripUrl(url);
+    const idStr = stripUrl(url);
     // Do not enqueue duplicate authorization requests.
     const isDuplicate = Object.values(this.#authRequestsV2).some(request => request.idStr === idStr);
     assert(!isDuplicate, `The source ${url} has a pending authorization request`);
@@ -265,7 +260,7 @@ export default class AuthRequestHandler {
     return this.authorizeUrlSubject;
   }
   ensureUrlAuthorizedV2(url) {
-    const idStr = this.stripUrl(url);
+    const idStr = stripUrl(url);
     return new Promise((resolve, reject) => {
       this.getAuthorize(value => {
         if (!value) {

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

@@ -12,7 +12,7 @@ export default class SubstrateRequestHandler {
     private updateIconSign;
     private signComplete;
     get numSubstrateRequests(): number;
-    sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
+    sign(url: string, request: RequestSign, account: AccountJson, _id?: string): Promise<ResponseSigning>;
     signTransaction(id: string, address: string, url: string, payload: SignerPayloadJSON): Promise<ResponseSigning>;
     resetWallet(): void;
 }

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

@@ -57,8 +57,8 @@ export default class SubstrateRequestHandler {
   get numSubstrateRequests() {
     return Object.keys(this.#substrateRequests).length;
   }
-  sign(url, request, account) {
-    const id = getId();
+  sign(url, request, account, _id) {
+    const id = _id || getId();
     return new Promise((resolve, reject) => {
       this.#substrateRequests[id] = {
         ...this.signComplete(id, resolve, reject),

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

@@ -0,0 +1,15 @@
+import RequestService from '@subwallet/extension-base/services/request-service';
+import { RequestWalletConnectSession, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
+import { BehaviorSubject } from 'rxjs';
+export default class WalletConnectRequestHandler {
+    #private;
+    readonly connectWCSubject: BehaviorSubject<WalletConnectSessionRequest[]>;
+    constructor(requestService: RequestService);
+    get allConnectWCRequests(): WalletConnectSessionRequest[];
+    get numConnectWCRequests(): number;
+    getConnectWCRequest(id: string): RequestWalletConnectSession;
+    private updateIconConnectWC;
+    private connectWCComplete;
+    addConnectWCRequest(request: WalletConnectSessionRequest): void;
+    resetWallet(): void;
+}

package/services/request-service/handler/WalletConnectRequestHandler.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 WalletConnectRequestHandler {
+  #requestService;
+  #walletConnectSessionRequests = {};
+  connectWCSubject = new BehaviorSubject([]);
+  constructor(requestService) {
+    this.#requestService = requestService;
+  }
+  get allConnectWCRequests() {
+    return Object.values(this.#walletConnectSessionRequests)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    .map(({
+      reject,
+      resolve,
+      ...data
+    }) => data);
+  }
+  get numConnectWCRequests() {
+    return Object.keys(this.#walletConnectSessionRequests).length;
+  }
+  getConnectWCRequest(id) {
+    return this.#walletConnectSessionRequests[id];
+  }
+  updateIconConnectWC(shouldClose) {
+    this.connectWCSubject.next(this.allConnectWCRequests);
+    this.#requestService.updateIconV2(shouldClose);
+  }
+  connectWCComplete = id => {
+    const complete = shouldClose => {
+      delete this.#walletConnectSessionRequests[id];
+      this.updateIconConnectWC(shouldClose);
+    };
+    return {
+      reject: () => {
+        complete(true);
+      },
+      resolve: () => {
+        complete(true);
+      }
+    };
+  };
+  addConnectWCRequest(request) {
+    const id = request.id;
+    this.#walletConnectSessionRequests[id] = {
+      ...this.connectWCComplete(id),
+      ...request
+    };
+    this.updateIconConnectWC();
+    this.#requestService.popupOpen();
+  }
+  resetWallet() {
+    for (const request of Object.values(this.#walletConnectSessionRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.connectWCSubject.next([]);
+  }
+}

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

@@ -4,6 +4,7 @@ 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 { MetadataDef } from '@subwallet/extension-inject/types';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { SignerPayloadJSON } from '@polkadot/types/types/extrinsic';
@@ -14,7 +15,6 @@ export default class RequestService {
     constructor(chainService: ChainService, settingService: SettingService, keyringService: KeyringService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;
-    stripUrl(url: string): string;
     getAddressList(value?: boolean): Record<string, boolean>;
     get popup(): number[];
     popupClose(): void;
@@ -43,7 +43,7 @@ export default class RequestService {
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
     get signSubject(): BehaviorSubject<SigningRequest[]>;
     get allSubstrateRequests(): SigningRequest[];
-    sign(url: string, request: RequestSign, account: AccountJson): Promise<ResponseSigning>;
+    sign(url: string, request: RequestSign, account: AccountJson, id?: string): Promise<ResponseSigning>;
     get numSubstrateRequests(): number;
     get numEvmRequests(): number;
     get confirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
@@ -52,6 +52,11 @@ export default class RequestService {
     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>;
     updateConfirmation<CT extends ConfirmationType>(id: string, type: CT, payload: ConfirmationDefinitions[CT][0]['payload'], options?: ConfirmationsQueueItemOptions, validator?: (input: ConfirmationDefinitions[CT][1]) => Error | undefined): void;
+    getConnectWCRequest(id: string): import("@subwallet/extension-base/services/wallet-connect-service/types").RequestWalletConnectSession;
+    get connectWCSubject(): BehaviorSubject<WalletConnectSessionRequest[]>;
+    get allConnectWCRequests(): WalletConnectSessionRequest[];
+    get numConnectWCRequests(): number;
+    addConnectWCRequest(request: WalletConnectSessionRequest): void;
     get numRequests(): number;
     resetWallet(): void;
 }

package/services/request-service/index.js

@@ -6,6 +6,7 @@ import EvmRequestHandler from '@subwallet/extension-base/services/request-servic
 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';
 export default class RequestService {
   // Common
   #chainService;
@@ -14,6 +15,7 @@ export default class RequestService {
   #authRequestHandler;
   #substrateRequestHandler;
   #evmRequestHandler;
+  #walletConnectRequestHandler;
 
   // Common
   constructor(chainService, settingService, keyringService) {
@@ -25,6 +27,7 @@ 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);
 
     // Reset icon on start service
     this.updateIconV2();
@@ -35,9 +38,6 @@ export default class RequestService {
   updateIconV2(shouldClose) {
     this.#popupHandler.updateIconV2(shouldClose);
   }
-  stripUrl(url) {
-    return this.#authRequestHandler.stripUrl(url);
-  }
   getAddressList(value = false) {
     const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
@@ -128,8 +128,8 @@ export default class RequestService {
   get allSubstrateRequests() {
     return this.#substrateRequestHandler.allSubstrateRequests;
   }
-  sign(url, request, account) {
-    return this.#substrateRequestHandler.sign(url, request, account);
+  sign(url, request, account, id) {
+    return this.#substrateRequestHandler.sign(url, request, account, id);
   }
   get numSubstrateRequests() {
     return this.#substrateRequestHandler.numSubstrateRequests;
@@ -158,14 +158,32 @@ export default class RequestService {
     return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
   }
 
+  // Wallet Connect requests
+  getConnectWCRequest(id) {
+    return this.#walletConnectRequestHandler.getConnectWCRequest(id);
+  }
+  get connectWCSubject() {
+    return this.#walletConnectRequestHandler.connectWCSubject;
+  }
+  get allConnectWCRequests() {
+    return this.#walletConnectRequestHandler.allConnectWCRequests;
+  }
+  get numConnectWCRequests() {
+    return this.#walletConnectRequestHandler.numConnectWCRequests;
+  }
+  addConnectWCRequest(request) {
+    return this.#walletConnectRequestHandler.addConnectWCRequest(request);
+  }
+
   // General methods
   get numRequests() {
-    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests;
+    return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests + this.numConnectWCRequests;
   }
   resetWallet() {
     this.#authRequestHandler.resetWallet();
     this.#substrateRequestHandler.resetWallet();
     this.#evmRequestHandler.resetWallet();
     this.#metadataRequestHandler.resetWallet();
+    this.#walletConnectRequestHandler.resetWallet();
   }
 }

package/services/transaction-service/helpers/index.d.ts

@@ -1,7 +1,7 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { SWTransaction } from '@subwallet/extension-base/services/transaction-service/types';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
-export declare const getTransactionId: (chainType: string, chain: string, isInternal: boolean) => string;
+export declare const getTransactionId: (chainType: string, chain: string, isInternal: boolean, isWalletConnect?: boolean) => string;
 export declare const getValidationId: (chainType: string, chain: string) => string;
 export declare const isSubstrateTransaction: (tx: SWTransaction['transaction']) => tx is SubmittableExtrinsic;
 export declare const getBaseTransactionInfo: (transaction: SWTransaction, chainInfoMap: Record<string, _ChainInfo>) => string;

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

@@ -4,8 +4,8 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 let transactionCount = 0;
 let validationCount = 0;
-export const getTransactionId = (chainType, chain, isInternal) => {
-  return `${isInternal ? 'internal' : 'external'}.${chainType}.${chain}.${Date.now()}.${++transactionCount}`;
+export const getTransactionId = (chainType, chain, isInternal, isWalletConnect = false) => {
+  return `${isInternal ? 'internal' : !isWalletConnect ? 'external' : 'wallet-connect'}.${chainType}.${chain}.${Date.now()}.${++transactionCount}`;
 };
 export const getValidationId = (chainType, chain) => {
   return `${chainType}.${chain}.${Date.now()}.${++validationCount}`;

package/services/transaction-service/index.js

@@ -13,6 +13,7 @@ import { TRANSACTION_TIMEOUT } from '@subwallet/extension-base/services/transact
 import { parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-base/services/transaction-service/event-parser';
 import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
+import { isWalletConnectRequest } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 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';
@@ -170,7 +171,7 @@ export default class TransactionService {
   }
   fillTransactionDefaultInfo(transaction) {
     const isInternal = !transaction.url;
-    const transactionId = getTransactionId(transaction.chainType, transaction.chain, isInternal);
+    const transactionId = getTransactionId(transaction.chainType, transaction.chain, isInternal, isWalletConnectRequest(transaction.id));
     return {
       ...transaction,
       createdAt: new Date().getTime(),

package/services/transaction-service/types.d.ts

@@ -23,7 +23,8 @@ export interface SWTransaction extends ValidateTransactionResponse, Partial<Pick
 }
 export declare type SWTransactionResult = Omit<SWTransaction, 'transaction' | 'additionalValidator' | 'eventsHandler'>;
 declare type SwInputBase = Pick<SWTransaction, 'address' | 'url' | 'data' | 'extrinsicType' | 'chain' | 'chainType' | 'ignoreWarnings' | 'transferNativeAmount'> & Partial<Pick<SWTransaction, 'additionalValidator' | 'eventsHandler'>>;
-export interface SWTransactionInput extends SwInputBase {
+export interface SWTransactionInput extends SwInputBase, Partial<Pick<SWTransaction, 'estimateFee'>> {
+    id?: string;
     transaction?: SWTransaction['transaction'] | null;
     warnings?: SWTransaction['warnings'];
     errors?: SWTransaction['errors'];

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

@@ -0,0 +1,11 @@
+import { WalletConnectSigningMethod } from '@subwallet/extension-base/services/wallet-connect-service/types';
+import { SignClientTypes } from '@walletconnect/types';
+export declare const PROJECT_ID = "6da34c0b48164d27681924dd9a46d6be";
+export declare const RELAY_URL = "wss://relay.walletconnect.com";
+export declare const DEFAULT_WALLET_CONNECT_OPTIONS: SignClientTypes.Options;
+export declare const ALL_WALLET_CONNECT_EVENT: SignClientTypes.Event[];
+export declare const WALLET_CONNECT_SUPPORTED_METHODS: WalletConnectSigningMethod[];
+export declare const WALLET_CONNECT_REQUEST_KEY = "wallet-connect";
+export declare const WALLET_CONNECT_EIP155_NAMESPACE = "eip155";
+export declare const WALLET_CONNECT_POLKADOT_NAMESPACE = "polkadot";
+export declare const WALLET_CONNECT_SUPPORT_NAMESPACES: string[];