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

package/cjs/utils/index.js

@@ -3,6 +3,40 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  notDef: true,
+  isDef: true,
+  nonEmptyArr: true,
+  isEmptyArray: true,
+  isAccountAll: true,
+  reformatAddress: true,
+  filterAddressByNetworkKey: true,
+  categoryAddresses: true,
+  categoryNetworks: true,
+  convertToEvmAddress: true,
+  isUrl: true,
+  inJestTest: true,
+  parseIpfsLink: true,
+  hexToStr: true,
+  utf16ToString: true,
+  hexToUTF16: true,
+  isValidSubstrateAddress: true,
+  toUnit: true,
+  sumBN: true,
+  convertFundStatus: true,
+  isAddressesEqual: true,
+  isValidProvider: true,
+  getCurrentProvider: true,
+  getNftProvider: true,
+  mergeNetworkProviders: true,
+  filterAndSortingAccountByAuthType: true,
+  parseRawNumber: true,
+  isSameAddress: true,
+  getDomainFromUrl: true,
+  waitTimeout: true,
+  stripUrl: true,
+  canDerive: true
+};
 Object.defineProperty(exports, "canDerive", {
   enumerable: true,
   get: function () {
@@ -29,6 +63,7 @@ exports.mergeNetworkProviders = mergeNetworkProviders;
 exports.parseIpfsLink = exports.notDef = exports.nonEmptyArr = void 0;
 exports.parseRawNumber = parseRawNumber;
 exports.reformatAddress = reformatAddress;
+exports.stripUrl = void 0;
 exports.sumBN = sumBN;
 exports.toUnit = void 0;
 exports.utf16ToString = utf16ToString;
@@ -38,6 +73,30 @@ var _constants = require("@subwallet/extension-base/constants");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
 var _canDerive = require("./canDerive");
+var _array = require("./array");
+Object.keys(_array).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _array[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _array[key];
+    }
+  });
+});
+var _environment = require("./environment");
+Object.keys(_environment).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _environment[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _environment[key];
+    }
+  });
+});
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -329,4 +388,10 @@ function getDomainFromUrl(url) {
 }
 async function waitTimeout(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
-}
+}
+const 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];
+};
+exports.stripUrl = stripUrl;

package/koni/api/nft/config.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { RuntimeInfo } from '@subwallet/extension-base/utils';
 export const SINGULAR_V1_ENDPOINT = 'https://singular.rmrk-api.xyz/api/account-rmrk1/';
 export const SINGULAR_V2_ENDPOINT = 'https://singular.rmrk-api.xyz/api/account/';
 export const KANARIA_ENDPOINT = 'https://kanaria.rmrk.app/api/rmrk2/';
@@ -68,9 +69,6 @@ export let SUPPORTED_TRANSFER_SUBSTRATE_CHAIN_NAME;
 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
@@ -89,13 +87,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 (!RuntimeInfo.protocol || RuntimeInfo.protocol && !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);
 export function getRandomIpfsGateway() {
   const weighedItems = [];

package/koni/api/xcm/polkadotXcm.js

@@ -5,7 +5,7 @@ import { getBeneficiary, getDestinationChainLocation, getDestWeight, getTokenLoc
 import { _isNativeToken, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 export function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = getDestWeight();
-  const version = ['statemint', 'statemine', 'shiden'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const version = ['statemint', 'statemine', 'shiden', 'astar'].includes(originChainInfo.slug) ? 'V3' : 'V1';
   const beneficiary = getBeneficiary(destinationChainInfo, recipientAddress, version);
   const destination = getDestinationChainLocation(originChainInfo, destinationChainInfo, version);
   let assetLocation = getTokenLocation(tokenInfo, value, version);

package/koni/api/xcm/xTokens.js

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

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

@@ -188,5 +188,11 @@ export default class KoniExtension {
     private reloadCron;
     private getLogoMap;
     private passPhishingPage;
+    private connectWalletConnect;
+    private connectWCSubscribe;
+    private approveWalletConnectSession;
+    private rejectWalletConnectSession;
+    private subscribeWalletConnectSessions;
+    private disconnectWalletConnectSession;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -23,13 +23,16 @@ import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
 import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
-import { reformatAddress } from '@subwallet/extension-base/utils';
+import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
+import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
+import { reformatAddress, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
 import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
+import { getSdkError } from '@walletconnect/utils';
 import BigN from 'bignumber.js';
 import { Transaction } from 'ethereumjs-tx';
 import { TypeRegistry } from '@polkadot/types';
@@ -489,7 +492,7 @@ export default class KoniExtension {
       const account = keyring.getAccount(address);
       const contact = keyring.getAddress(address);
       return account || contact || {
-        ...keyring.saveRecent(accountId).json,
+        ...keyring.saveRecent(address).json,
         publicKey: decodeAddress(address)
       };
     } else {
@@ -3012,6 +3015,131 @@ export default class KoniExtension {
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
+  /// Wallet connect
+
+  // Connect
+  async connectWalletConnect({
+    uri
+  }) {
+    await this.#koniState.walletConnectService.connect(uri);
+    return true;
+  }
+  connectWCSubscribe(id, port) {
+    const cb = 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({
+    accounts: selectedAccounts,
+    id
+  }) {
+    const request = this.#koniState.requestService.getConnectWCRequest(id);
+    if (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(([key, namespace]) => {
+      if (isSupportWalletConnectNamespace(key)) {
+        if (namespace.chains) {
+          const unSupportChains = namespace.chains.filter(chain => !isSupportWalletConnectChain(chain, chainInfoMap));
+          if (unSupportChains.length) {
+            throw new Error(getSdkError('UNSUPPORTED_CHAINS').message + ' ' + unSupportChains.toString());
+          }
+          availableNamespaces[key] = namespace;
+        }
+      } else {
+        throw new Error(getSdkError('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
+      }
+    });
+    Object.entries(optionalNamespaces).forEach(([key, namespace]) => {
+      if (isSupportWalletConnectNamespace(key)) {
+        if (namespace.chains) {
+          const supportChains = namespace.chains.filter(chain => 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(([key, namespace]) => {
+      if (namespace.chains) {
+        const accounts = [];
+        const chains = uniqueStringArray(namespace.chains);
+        chains.forEach(chain => {
+          accounts.push(...selectedAccounts.filter(address => isEthereumAddress(address) === (key === 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({
+    id
+  }) {
+    const request = this.#koniState.requestService.getConnectWCRequest(id);
+    const wcId = request.request.id;
+    if (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 = 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({
+    topic
+  }) {
+    await this.#koniState.walletConnectService.disconnect(topic);
+    return true;
+  }
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -3385,6 +3513,20 @@ export default 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/koni/background/handlers/State.d.ts

@@ -17,6 +17,7 @@ import SettingService from '@subwallet/extension-base/services/setting-service/S
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
+import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import SimpleKeyring from 'eth-simple-keyring';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -58,6 +59,7 @@ export default class KoniState {
     readonly balanceService: BalanceService;
     readonly migrationService: MigrationService;
     readonly subscanService: SubscanService;
+    readonly walletConnectService: WalletConnectService;
     private generalStatus;
     private waitSleeping;
     private waitStarting;

package/koni/background/handlers/State.js

@@ -24,7 +24,9 @@ import DatabaseService from '@subwallet/extension-base/services/storage-service/
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import { SUBSCAN_CHAIN_MAP_REVERSE } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
+import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
+import { stripUrl } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -92,6 +94,7 @@ export default class KoniState {
     this.balanceService = new BalanceService(this.chainService);
     this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     this.transactionService = new TransactionService(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
+    this.walletConnectService = new WalletConnectService(this, this.requestService);
     this.migrationService = new MigrationService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
@@ -1248,9 +1251,10 @@ export default class KoniState {
     const transactionData = {
       ...transaction
     };
+    const token = this.chainService.getNativeTokenInfo(networkKey);
     if (eType === ExtrinsicType.TRANSFER_BALANCE) {
       // @ts-ignore
-      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+      transactionData.tokenSlug = token.slug;
     }
 
     // Custom handle this instead of general handler transaction
@@ -1261,7 +1265,13 @@ export default class KoniState {
       url,
       data: transactionData,
       extrinsicType: eType,
-      chainType: ChainType.EVM
+      chainType: ChainType.EVM,
+      estimateFee: {
+        value: estimateGas,
+        symbol: token.symbol,
+        decimals: token.decimals || 18
+      },
+      id
     });
 
     // Wait extrinsic hash
@@ -1505,7 +1515,7 @@ export default class KoniState {
         const result = {
           ...value
         };
-        const url = this.requestService.stripUrl(_url);
+        const url = stripUrl(_url);
         result[url] = {
           pass: true
         };
@@ -1525,6 +1535,7 @@ export default class KoniState {
       this.settingService.resetWallet();
     }
     this.chainService.resetWallet(resetAll);
+    await this.walletConnectService.resetWallet(resetAll);
     await this.chainService.init();
   }
 }

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

@@ -1,5 +1,6 @@
 /// <reference types="chrome" />
 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 { RequestArguments } from 'web3-core';
@@ -46,5 +47,6 @@ export default class KoniTabs {
     private handleEvmRequest;
     private handleEvmSend;
     isEvmPublicRequest(type: string, request: RequestArguments): boolean;
+    addPspToken(id: string, url: string, { genesisHash, tokenInfo: input }: RequestAddPspToken): Promise<true>;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], url: string, port: chrome.runtime.Port): Promise<ResponseTypes[keyof ResponseTypes]>;
 }

package/koni/background/handlers/Tabs.js

@@ -13,16 +13,11 @@ import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
-import { canDerive } from '@subwallet/extension-base/utils';
+import { canDerive, stripUrl } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { assert, isNumber } from '@polkadot/util';
-function 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];
-}
 function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthType) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   let authTypeFilter = ({
@@ -401,7 +396,7 @@ export default class KoniTabs {
         tokenInfo.contractError = true;
       } else {
         tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
-        tokenInfo.name = validate.name;
+        tokenInfo.name = validate.name || tokenInfo.name;
         tokenInfo.symbol = validate.symbol;
         tokenInfo.decimals = validate.decimals;
       }
@@ -825,6 +820,60 @@ export default class KoniTabs {
       return false;
     }
   }
+  async addPspToken(id, url, {
+    genesisHash,
+    tokenInfo: input
+  }) {
+    const _tokenType = input.type;
+    if (_tokenType !== 'psp22' && _tokenType !== 'psp34') {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, `Assets type ${_tokenType} is not supported`);
+    }
+    if (!input.address || !input.symbol) {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Assets params require address and symbol');
+    }
+    const [chain] = this.#koniState.findNetworkKeyByGenesisHash(genesisHash);
+    if (!chain) {
+      throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current chain is not available');
+    }
+    const state = this.#koniState.getChainStateByKey(chain);
+    if (!state.active) {
+      await this.#koniState.enableChain(chain, false);
+      const api = this.#koniState.getSubstrateApi(chain);
+      await api.isReady;
+    }
+    const tokenType = _tokenType === 'psp22' ? _AssetType.PSP22 : _AssetType.PSP34;
+    const tokenInfo = {
+      slug: '',
+      type: tokenType,
+      name: input.symbol || '',
+      contractAddress: input.address,
+      symbol: input.symbol || '',
+      decimals: input.decimals || 0,
+      originChain: chain,
+      contractError: false,
+      validated: false
+    };
+    this.#koniState.validateCustomAsset({
+      type: tokenType,
+      contractAddress: input.address,
+      originChain: chain
+    }).then(validate => {
+      if (validate.contractError) {
+        tokenInfo.contractError = true;
+      } else {
+        tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
+        tokenInfo.name = validate.name || tokenInfo.name;
+        tokenInfo.symbol = validate.symbol;
+        tokenInfo.decimals = validate.decimals;
+      }
+    }).catch(() => {
+      tokenInfo.contractError = true;
+    }).finally(() => {
+      tokenInfo.validated = true;
+      this.#koniState.requestService.updateConfirmation(id, 'addTokenRequest', tokenInfo);
+    });
+    return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
+  }
   async handle(id, type, request, url, port) {
     if (type === 'pub(phishing.redirectIfDenied)') {
       return this.redirectIfPhishing(url);
@@ -860,6 +909,8 @@ export default class KoniTabs {
         return this.rpcSubscribeConnected(request, id, port);
       case 'pub(rpc.unsubscribe)':
         return this.rpcUnsubscribe(request, port);
+      case 'pub(token.add)':
+        return this.addPspToken(id, url, request);
 
       ///
       case 'pub(authorize.tabV2)':