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

package/background/KoniTypes.d.ts

@@ -6,10 +6,12 @@ import { AccountAuthType, AccountJson, AddressJson, AuthorizeRequest, Confirmati
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
+import { WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
 import { KeyringAddress, KeyringPairs$Json } from '@subwallet/ui-keyring/types';
+import { SessionTypes } from '@walletconnect/types/dist/types/sign-client/session';
 import Web3 from 'web3';
 import { RequestArguments, TransactionConfig } from 'web3-core';
 import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
@@ -18,6 +20,21 @@ import { BN } from '@polkadot/util';
 import { HexString } from '@polkadot/util/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 import { TransactionWarning } from './warnings/TransactionWarning';
+export declare enum RuntimeEnvironment {
+    Web = "Web",
+    Node = "Node",
+    ExtensionChrome = "Extension (Chrome)",
+    ExtensionFirefox = "Extension (Firefox)",
+    WebWorker = "Web Worker",
+    ServiceWorker = "Service Worker",
+    Unknown = "Unknown"
+}
+export interface RuntimeEnvironmentInfo {
+    environment: RuntimeEnvironment;
+    version: string;
+    host?: string;
+    protocol?: string;
+}
 export interface ServiceInfo {
     chainInfoMap: Record<string, _ChainInfo>;
     chainStateMap: Record<string, _ChainState>;
@@ -1407,6 +1424,33 @@ export interface PassPhishing {
 export interface RequestPassPhishingPage {
     url: string;
 }
+export interface RequestAddPspToken {
+    genesisHash: string;
+    tokenInfo: {
+        type: string;
+        address: string;
+        symbol: string;
+        name: string;
+        decimals?: number;
+        logo?: string;
+    };
+}
+export interface RequestConnectWalletConnect {
+    uri: string;
+}
+export interface RequestRejectConnectWalletSession {
+    id: string;
+}
+export interface RequestApproveConnectWalletSession {
+    id: string;
+    accounts: string[];
+}
+export interface RequestReconnectConnectWalletSession {
+    id: string;
+}
+export interface RequestDisconnectWalletConnectSession {
+    topic: string;
+}
 export interface KoniRequestSignatures {
     'pri(staking.submitTuringCancelCompound)': [RequestTuringCancelStakeCompound, SWTransactionResponse];
     'pri(staking.submitTuringCompound)': [RequestTuringStakeCompound, SWTransactionResponse];
@@ -1561,6 +1605,14 @@ export interface KoniRequestSignatures {
     'mobile(subscription.start)': [SubscriptionServiceType[], void];
     'mobile(subscription.stop)': [SubscriptionServiceType[], void];
     'mobile(subscription.restart)': [SubscriptionServiceType[], void];
+    'pub(token.add)': [RequestAddPspToken, boolean];
+    'pri(walletConnect.connect)': [RequestConnectWalletConnect, boolean];
+    'pri(walletConnect.requests.subscribe)': [null, WalletConnectSessionRequest[], WalletConnectSessionRequest[]];
+    'pri(walletConnect.session.approve)': [RequestApproveConnectWalletSession, boolean];
+    'pri(walletConnect.session.reject)': [RequestRejectConnectWalletSession, boolean];
+    'pri(walletConnect.session.reconnect)': [RequestReconnectConnectWalletSession, boolean];
+    'pri(walletConnect.session.subscribe)': [null, SessionTypes.Struct[], SessionTypes.Struct[]];
+    'pri(walletConnect.session.disconnect)': [RequestDisconnectWalletConnectSession, boolean];
 }
 export interface ApplicationMetadataType {
     version: string;

package/background/KoniTypes.js

@@ -1,24 +1,16 @@
 // Copyright 2019-2022 @polkadot/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-/// Request Auth
-
-/// Manage Auth
-
-// Get Auth
-
-// Auth All site
-
-// Manage site auth (all allowed/unAllowed)
-
-// Manage single auth with single account
-
-// Manage single site with multi account
-
-// Manage site block
-
-// Forget site auth
-
+export let RuntimeEnvironment;
+(function (RuntimeEnvironment) {
+  RuntimeEnvironment["Web"] = "Web";
+  RuntimeEnvironment["Node"] = "Node";
+  RuntimeEnvironment["ExtensionChrome"] = "Extension (Chrome)";
+  RuntimeEnvironment["ExtensionFirefox"] = "Extension (Firefox)";
+  RuntimeEnvironment["WebWorker"] = "Web Worker";
+  RuntimeEnvironment["ServiceWorker"] = "Service Worker";
+  RuntimeEnvironment["Unknown"] = "Unknown";
+})(RuntimeEnvironment || (RuntimeEnvironment = {}));
 /// Staking subscribe
 
 export let StakingType;

package/background/handlers/State.d.ts

@@ -70,7 +70,6 @@ export default class State {
     private saveCurrentAuthList;
     private metaComplete;
     private signComplete;
-    stripUrl(url: string): string;
     private updateIcon;
     toggleAuthorization(url: string): AuthUrls;
     private updateIconAuth;

package/background/handlers/State.js

@@ -3,6 +3,7 @@
 
 import { DEFAULT_SETTING } from '@subwallet/extension-base/services/setting-service/constants';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
+import { stripUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { addMetadata, knownMetadata } from '@subwallet/extension-chains';
 import { BehaviorSubject } from 'rxjs';
@@ -206,7 +207,7 @@ export default class State {
         url
       } = this.#authRequests[id];
       const isAllowedMap = {};
-      this.#authUrls[this.stripUrl(url)] = {
+      this.#authUrls[stripUrl(url)] = {
         count: 0,
         id: idStr,
         isAllowed,
@@ -264,11 +265,6 @@ export default class State {
       }
     };
   };
-  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];
-  }
   updateIcon(shouldClose) {
     const authCount = this.numAuthRequests;
     const metaCount = this.numMetaRequests;
@@ -304,7 +300,7 @@ export default class State {
     this.updateIcon(shouldClose);
   }
   async authorizeUrl(url, request) {
-    const idStr = this.stripUrl(url);
+    const idStr = stripUrl(url);
 
     // Do not enqueue duplicate authorization requests.
     const isDuplicate = Object.values(this.#authRequests).some(request => request.idStr === idStr);
@@ -328,7 +324,7 @@ export default class State {
     });
   }
   ensureUrlAuthorized(url) {
-    const entry = this.#authUrls[this.stripUrl(url)];
+    const entry = this.#authUrls[stripUrl(url)];
     assert(entry, `The source ${url} has not been enabled yet`);
     assert(entry.isAllowed, `The source ${url} is not allowed to interact with this extension`);
     return true;

package/cjs/background/KoniTypes.js

@@ -3,18 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UnstakingStatus = exports.TransferTxErrorType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.StakingTxErrorType = exports.StakingStatus = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.ChainEditStandard = exports.BasicTxWarningCode = exports.BasicTxErrorType = exports.BalanceErrorType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
+exports.UnstakingStatus = exports.TransferTxErrorType = exports.TransactionDirection = exports.ThemeNames = exports.StakingType = exports.StakingTxErrorType = exports.StakingStatus = exports.RuntimeEnvironment = exports.RMRK_VER = exports.ProviderErrorType = exports.NotificationType = exports.NETWORK_STATUS = exports.NETWORK_ERROR = exports.ExtrinsicType = exports.ExtrinsicStatus = exports.ExternalRequestPromiseStatus = exports.EvmProviderErrorType = exports.CrowdloanParaState = exports.ContractType = exports.ChainType = exports.ChainEditStandard = exports.BasicTxWarningCode = exports.BasicTxErrorType = exports.BalanceErrorType = exports.AccountExternalErrorCode = exports.APIItemState = void 0;
 // Copyright 2019-2022 @polkadot/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-/// Request Auth
-/// Manage Auth
-// Get Auth
-// Auth All site
-// Manage site auth (all allowed/unAllowed)
-// Manage single auth with single account
-// Manage single site with multi account
-// Manage site block
-// Forget site auth
+let RuntimeEnvironment;
+exports.RuntimeEnvironment = RuntimeEnvironment;
+(function (RuntimeEnvironment) {
+  RuntimeEnvironment["Web"] = "Web";
+  RuntimeEnvironment["Node"] = "Node";
+  RuntimeEnvironment["ExtensionChrome"] = "Extension (Chrome)";
+  RuntimeEnvironment["ExtensionFirefox"] = "Extension (Firefox)";
+  RuntimeEnvironment["WebWorker"] = "Web Worker";
+  RuntimeEnvironment["ServiceWorker"] = "Service Worker";
+  RuntimeEnvironment["Unknown"] = "Unknown";
+})(RuntimeEnvironment || (exports.RuntimeEnvironment = RuntimeEnvironment = {}));
 /// Staking subscribe
 let StakingType;
 exports.StakingType = StakingType;

package/cjs/background/handlers/State.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.NotificationOptions = void 0;
 var _constants = require("@subwallet/extension-base/services/setting-service/constants");
 var _Settings = _interopRequireDefault(require("@subwallet/extension-base/stores/Settings"));
+var _utils = require("@subwallet/extension-base/utils");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _extensionChains = require("@subwallet/extension-chains");
 var _rxjs = require("rxjs");
@@ -232,7 +233,7 @@ class State {
         url
       } = this.#authRequests[id];
       const isAllowedMap = {};
-      this.#authUrls[this.stripUrl(url)] = {
+      this.#authUrls[(0, _utils.stripUrl)(url)] = {
         count: 0,
         id: idStr,
         isAllowed,
@@ -290,11 +291,6 @@ class State {
       }
     };
   };
-  stripUrl(url) {
-    (0, _util.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];
-  }
   updateIcon(shouldClose) {
     const authCount = this.numAuthRequests;
     const metaCount = this.numMetaRequests;
@@ -330,7 +326,7 @@ class State {
     this.updateIcon(shouldClose);
   }
   async authorizeUrl(url, request) {
-    const idStr = this.stripUrl(url);
+    const idStr = (0, _utils.stripUrl)(url);
 
     // Do not enqueue duplicate authorization requests.
     const isDuplicate = Object.values(this.#authRequests).some(request => request.idStr === idStr);
@@ -354,7 +350,7 @@ class State {
     });
   }
   ensureUrlAuthorized(url) {
-    const entry = this.#authUrls[this.stripUrl(url)];
+    const entry = this.#authUrls[(0, _utils.stripUrl)(url)];
     (0, _util.assert)(entry, `The source ${url} has not been enabled yet`);
     (0, _util.assert)(entry.isAllowed, `The source ${url} is not allowed to interact with this extension`);
     return true;

package/cjs/koni/api/nft/config.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.UNIQUE_SCAN_ENDPOINT = exports.UNIQUE_IPFS_GATEWAY = exports.TRANSFER_CHAIN_ID = exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN_NAME = exports.SUPPORTED_TRANSFER_EVM_CHAIN = exports.SUPPORTED_NFT_NETWORKS = exports.SINGULAR_V2_ENDPOINT = exports.SINGULAR_V2_COLLECTION_ENDPOINT = exports.SINGULAR_V1_ENDPOINT = exports.SINGULAR_V1_COLLECTION_ENDPOINT = exports.RMRK_PINATA_SERVER = exports.QUARTZ_SCAN_ENDPOINT = exports.PINATA_IPFS_GATEWAY = exports.NFT_STORAGE_GATEWAY = exports.KANARIA_EXTERNAL_SERVER = exports.KANARIA_ENDPOINT = exports.IPFS_TELOS_MIAMI = exports.IPFS_IO_GATEWAY = exports.IPFS_GATEWAY_CLOUD = exports.IPFS_FLEEK = exports.GATEWAY_IPFS_IO = exports.DWEB_LINK = exports.CLOUDFLARE_PINATA_SERVER = exports.CF_IPFS_GATEWAY = exports.BIT_COUNTRY_THUMBNAIL_RESOLVER = exports.BIT_COUNTRY_SERVER = void 0;
 exports.getRandomIpfsGateway = getRandomIpfsGateway;
+var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -102,9 +103,6 @@ exports.SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME = SUPPORTED_TRANSFER_SUBSTRATE_C
 const RANDOM_IPFS_GATEWAY_SETTING = [{
   provider: IPFS_IO_GATEWAY,
   weight: 0 // Not stable
-}, {
-  provider: NFT_STORAGE_GATEWAY,
-  weight: 50
 }, {
   provider: CF_IPFS_GATEWAY,
   weight: 4
@@ -123,13 +121,20 @@ const RANDOM_IPFS_GATEWAY_SETTING = [{
 }, {
   provider: IPFS_GATEWAY_CLOUD,
   weight: 0 // Deceptive site warning
-}, {
-  provider: IPFS_FLEEK,
-  weight: 4
 }, {
   provider: IPFS_TELOS_MIAMI,
   weight: 0
 }];
+if (!_utils.RuntimeInfo.protocol || _utils.RuntimeInfo.protocol && !_utils.RuntimeInfo.protocol.startsWith('http')) {
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: NFT_STORAGE_GATEWAY,
+    weight: 50
+  });
+  RANDOM_IPFS_GATEWAY_SETTING.push({
+    provider: IPFS_FLEEK,
+    weight: 4
+  });
+}
 const RANDOM_IPFS_GATEWAY_TOTAL_WEIGHT = RANDOM_IPFS_GATEWAY_SETTING.reduce((value, item) => value + item.weight, 0);
 function getRandomIpfsGateway() {
   const weighedItems = [];

package/cjs/koni/api/xcm/polkadotXcm.js

@@ -11,7 +11,7 @@ var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 
 function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = (0, _utils.getDestWeight)();
-  const version = ['statemint', 'statemine', 'shiden'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const version = ['statemint', 'statemine', 'shiden', 'astar'].includes(originChainInfo.slug) ? 'V3' : 'V1';
   const beneficiary = (0, _utils.getBeneficiary)(destinationChainInfo, recipientAddress, version);
   const destination = (0, _utils.getDestinationChainLocation)(originChainInfo, destinationChainInfo, version);
   let assetLocation = (0, _utils.getTokenLocation)(tokenInfo, value, version);

package/cjs/koni/api/xcm/xTokens.js

@@ -24,7 +24,7 @@ function getCurrencyId(tokenInfo) {
   return (0, _utils2._getTokenOnChainInfo)(tokenInfo) || (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
 }
 function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = ['pioneer', 'hydradx_main'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
-  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const weightParam = ['pioneer'].includes(originChainInfo.slug) ? _utils.FOUR_INSTRUCTIONS_WEIGHT : (0, _utils.getDestWeight)();
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot', 'interlay', 'hydradx_main'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, (0, _utils.getDestMultilocation)(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/cjs/koni/background/handlers/Extension.js

@@ -27,6 +27,8 @@ var _xcm = require("@subwallet/extension-base/koni/api/xcm");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
 var _constants3 = require("@subwallet/extension-base/services/setting-service/constants");
+var _constants4 = require("@subwallet/extension-base/services/wallet-connect-service/constants");
+var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
 var _utils2 = require("@subwallet/extension-base/utils");
 var _address2 = require("@subwallet/extension-base/utils/address");
 var _eth = require("@subwallet/extension-base/utils/eth");
@@ -34,6 +36,7 @@ var _parseTransaction2 = require("@subwallet/extension-base/utils/eth/parseTrans
 var _number = require("@subwallet/extension-base/utils/number");
 var _keyring = require("@subwallet/keyring");
 var _uiKeyring = require("@subwallet/ui-keyring");
+var _utils3 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsTx = require("ethereumjs-tx");
 var _types2 = require("@polkadot/types");
@@ -519,7 +522,7 @@ class KoniExtension {
       const account = _uiKeyring.keyring.getAccount(address);
       const contact = _uiKeyring.keyring.getAddress(address);
       return account || contact || {
-        ..._uiKeyring.keyring.saveRecent(accountId).json,
+        ..._uiKeyring.keyring.saveRecent(address).json,
         publicKey: (0, _utilCrypto.decodeAddress)(address)
       };
     } else {
@@ -3096,6 +3099,138 @@ class KoniExtension {
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
+  /// Wallet connect
+
+  // Connect
+  async connectWalletConnect(_ref75) {
+    let {
+      uri
+    } = _ref75;
+    await this.#koniState.walletConnectService.connect(uri);
+    return true;
+  }
+  connectWCSubscribe(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.requestService.connectWCSubject.subscribe(requests => cb(requests));
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+      subscription.unsubscribe();
+    });
+    return this.#koniState.requestService.allConnectWCRequests;
+  }
+  async approveWalletConnectSession(_ref76) {
+    let {
+      accounts: selectedAccounts,
+      id
+    } = _ref76;
+    const request = this.#koniState.requestService.getConnectWCRequest(id);
+    if ((0, _helpers2.isProposalExpired)(request.request.params)) {
+      throw new Error('The proposal has been expired');
+    }
+    const wcId = request.request.id;
+    const params = request.request.params;
+    const requiredNamespaces = params.requiredNamespaces;
+    const optionalNamespaces = params.optionalNamespaces;
+    const availableNamespaces = {};
+    const namespaces = {};
+    const chainInfoMap = this.#koniState.getChainInfoMap();
+    Object.entries(requiredNamespaces).forEach(_ref77 => {
+      let [key, namespace] = _ref77;
+      if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
+        if (namespace.chains) {
+          const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
+          if (unSupportChains.length) {
+            throw new Error((0, _utils3.getSdkError)('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+          }
+          availableNamespaces[key] = namespace;
+        }
+      } else {
+        throw new Error((0, _utils3.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+      }
+    });
+    Object.entries(optionalNamespaces).forEach(_ref78 => {
+      let [key, namespace] = _ref78;
+      if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
+        if (namespace.chains) {
+          const supportChains = namespace.chains.filter(chain => (0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap)) || [];
+          const requiredNameSpace = availableNamespaces[key];
+          const defaultChains = [];
+          if (requiredNameSpace) {
+            availableNamespaces[key] = {
+              chains: [...(requiredNameSpace.chains || defaultChains), ...(supportChains || defaultChains)],
+              events: requiredNameSpace.events,
+              methods: requiredNameSpace.methods
+            };
+          } else {
+            if (supportChains.length) {
+              availableNamespaces[key] = {
+                chains: supportChains,
+                events: namespace.events,
+                methods: namespace.methods
+              };
+            }
+          }
+        }
+      }
+    });
+    Object.entries(availableNamespaces).forEach(_ref79 => {
+      let [key, namespace] = _ref79;
+      if (namespace.chains) {
+        const accounts = [];
+        const chains = (0, _utils2.uniqueStringArray)(namespace.chains);
+        chains.forEach(chain => {
+          accounts.push(...selectedAccounts.filter(address => (0, _utilCrypto.isEthereumAddress)(address) === (key === _constants4.WALLET_CONNECT_EIP155_NAMESPACE)).map(address => `${chain}:${address}`));
+        });
+        namespaces[key] = {
+          accounts,
+          methods: namespace.methods,
+          events: namespace.events,
+          chains: chains
+        };
+      }
+    });
+    const result = {
+      id: wcId,
+      namespaces: namespaces,
+      relayProtocol: params.relays[0].protocol
+    };
+    await this.#koniState.walletConnectService.approveSession(result);
+    request.resolve();
+    return true;
+  }
+  async rejectWalletConnectSession(_ref80) {
+    let {
+      id
+    } = _ref80;
+    const request = this.#koniState.requestService.getConnectWCRequest(id);
+    const wcId = request.request.id;
+    if ((0, _helpers2.isProposalExpired)(request.request.params)) {
+      request.reject(new Error('The proposal has been expired'));
+      return true;
+    }
+    await this.#koniState.walletConnectService.rejectSession(wcId);
+    request.reject(new Error('USER_REJECTED'));
+    return true;
+  }
+  subscribeWalletConnectSessions(id, port) {
+    const cb = (0, _subscriptions.createSubscription)(id, port);
+    const subscription = this.#koniState.walletConnectService.sessionSubject.subscribe(rs => {
+      cb(rs);
+    });
+    port.onDisconnect.addListener(() => {
+      subscription.unsubscribe();
+      this.cancelSubscription(id);
+    });
+    return this.#koniState.walletConnectService.sessions;
+  }
+  async disconnectWalletConnectSession(_ref81) {
+    let {
+      topic
+    } = _ref81;
+    await this.#koniState.walletConnectService.disconnect(topic);
+    return true;
+  }
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -3469,6 +3604,20 @@ class KoniExtension {
       case 'pri(settings.getLogoMaps)':
         return await this.getLogoMap();
 
+      /// Wallet Connect
+      case 'pri(walletConnect.connect)':
+        return this.connectWalletConnect(request);
+      case 'pri(walletConnect.requests.subscribe)':
+        return this.connectWCSubscribe(id, port);
+      case 'pri(walletConnect.session.approve)':
+        return this.approveWalletConnectSession(request);
+      case 'pri(walletConnect.session.reject)':
+        return this.rejectWalletConnectSession(request);
+      case 'pri(walletConnect.session.subscribe)':
+        return this.subscribeWalletConnectSessions(id, port);
+      case 'pri(walletConnect.session.disconnect)':
+        return this.disconnectWalletConnectSession(request);
+
       // Default
       default:
         throw new Error(`Unable to handle message of type ${type}`);

package/cjs/koni/background/handlers/State.js

@@ -28,7 +28,9 @@ var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
 var _subscanChainMap = require("@subwallet/extension-base/services/subscan-service/subscan-chain-map");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
+var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
+var _utils2 = require("@subwallet/extension-base/utils");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _decode = require("@subwallet/keyring/pair/decode");
@@ -101,6 +103,7 @@ class KoniState {
     this.balanceService = new _balanceService.BalanceService(this.chainService);
     this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     this.transactionService = new _transactionService.default(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
+    this.walletConnectService = new _walletConnectService.default(this, this.requestService);
     this.migrationService = new _migrationService.default(this);
     this.subscription = new _subscription.KoniSubscription(this, this.dbService);
     this.cron = new _cron.KoniCron(this, this.subscription, this.dbService);
@@ -1273,9 +1276,10 @@ class KoniState {
     const transactionData = {
       ...transaction
     };
+    const token = this.chainService.getNativeTokenInfo(networkKey);
     if (eType === _KoniTypes.ExtrinsicType.TRANSFER_BALANCE) {
       // @ts-ignore
-      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+      transactionData.tokenSlug = token.slug;
     }
 
     // Custom handle this instead of general handler transaction
@@ -1286,7 +1290,13 @@ class KoniState {
       url,
       data: transactionData,
       extrinsicType: eType,
-      chainType: _KoniTypes.ChainType.EVM
+      chainType: _KoniTypes.ChainType.EVM,
+      estimateFee: {
+        value: estimateGas,
+        symbol: token.symbol,
+        decimals: token.decimals || 18
+      },
+      id
     });
 
     // Wait extrinsic hash
@@ -1534,7 +1544,7 @@ class KoniState {
         const result = {
           ...value
         };
-        const url = this.requestService.stripUrl(_url);
+        const url = (0, _utils2.stripUrl)(_url);
         result[url] = {
           pass: true
         };
@@ -1554,6 +1564,7 @@ class KoniState {
       this.settingService.resetWallet();
     }
     this.chainService.resetWallet(resetAll);
+    await this.walletConnectService.resetWallet(resetAll);
     await this.chainService.init();
   }
 }