@web3auth/no-modal 10.16.0 → 11.0.0-beta.1

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js

@@ -7,33 +7,24 @@ var auth = require('@web3auth/auth');
 require('@segment/analytics-next');
 var loglevel = require('../../base/loglevel.js');
 var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 var index = require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var baseProvider = require('../../providers/base-provider/baseProvider.js');
 require('../../providers/base-provider/CommonJRPCProvider.js');
 require('../../providers/base-provider/commonPrivateKeyProvider.js');
 require('../../providers/base-provider/utils.js');
-require('@ethereumjs/util');
-require('bignumber.js');
-require('../../providers/ethereum-provider/providers/converter.js');
-require('bn.js');
-require('../../providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js');
 var ethRpcMiddlewares = require('../../providers/ethereum-provider/rpc/ethRpcMiddlewares.js');
 var jrpcClient = require('../../providers/ethereum-provider/rpc/jrpcClient.js');
 require('viem');
-require('@solana/wallet-standard-features');
-require('@solana/web3.js');
-require('@toruslabs/bs58');
-var JrpcClient = require('../../providers/solana-provider/rpc/JrpcClient.js');
-var solanaRpcMiddlewares = require('../../providers/solana-provider/rpc/solanaRpcMiddlewares.js');
-require('@web3auth/ws-embed');
 var utils$1 = require('./utils.js');
 var walletConnectV2Utils = require('./walletConnectV2Utils.js');
 
@@ -114,7 +105,11 @@ class WalletConnectV2Provider extends baseProvider.BaseProvider {
     if (chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155) {
       await this.setupEthEngine(connector, chainId);
     } else if (chain.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
-      await this.setupSolEngine(connector, chainId);
+      // Solana operations are handled via WCSolanaWallet directly; only update accounts state.
+      const accounts = await walletConnectV2Utils.getAccounts(connector);
+      this.update({
+        accounts: accounts || []
+      });
     } else {
       throw new Error(`Unsupported chainNamespace: ${chain.chainNamespace}`);
     }
@@ -139,34 +134,13 @@ class WalletConnectV2Provider extends baseProvider.BaseProvider {
     });
     const ethMiddleware = ethRpcMiddlewares.createEthMiddleware(providerHandlers);
     const chainSwitchMiddleware = this.getEthChainSwitchMiddleware();
-    const engine = new auth.JRPCEngine();
     const {
       networkMiddleware
     } = jrpcClient.createEthJsonRpcClient(chain);
-    engine.push(ethMiddleware);
-    engine.push(chainSwitchMiddleware);
-    engine.push(networkMiddleware);
-    const provider = auth.providerFromEngine(engine);
-    this.updateProviderEngineProxy(provider);
-  }
-  async setupSolEngine(connector, chainId) {
-    const chain = this.getChain(chainId);
-    const providerHandlers = walletConnectV2Utils.getSolProviderHandlers({
-      connector,
-      chainId
+    const engine = auth.JRPCEngineV2.create({
+      middleware: [ethMiddleware, chainSwitchMiddleware, networkMiddleware]
     });
-    const jrpcRes = await walletConnectV2Utils.getAccounts(connector);
-    this.update({
-      accounts: jrpcRes || []
-    });
-    const solMiddleware = solanaRpcMiddlewares.createSolanaMiddleware(providerHandlers);
-    const engine = new auth.JRPCEngine();
-    const {
-      networkMiddleware
-    } = JrpcClient.createSolanaJsonRpcClient(chain);
-    engine.push(solMiddleware);
-    engine.push(networkMiddleware);
-    const provider = auth.providerFromEngine(engine);
+    const provider = auth.providerFromEngineV2(engine);
     this.updateProviderEngineProxy(provider);
   }
   getEthChainSwitchMiddleware() {

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/config.js

@@ -5,17 +5,18 @@ require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 require('../../base/loglevel.js');
 var baseControllers = require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('@web3auth/auth');
 require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var constants = require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
-var constants = require('../../base/constants.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var utils = require('../utils.js');
 
 exports.DEFAULT_EIP155_METHODS = void 0;

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -4,16 +4,18 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var baseControllers = require('@toruslabs/base-controllers');
 var Client = require('@walletconnect/sign-client');
-var utils$2 = require('@walletconnect/utils');
+var utils$1 = require('@walletconnect/utils');
 var wsEmbed = require('@web3auth/ws-embed');
 var deepmerge = require('deepmerge');
+var siwe = require('viem/siwe');
 var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
 require('../../base/connector/connectorStatus.js');
 var constants = require('../../base/connector/constants.js');
 require('@web3auth/auth');
-var utils$1 = require('../../base/connector/utils.js');
+require('jwt-decode');
+var constants$1 = require('../../base/constants.js');
 var index$1 = require('../../base/errors/index.js');
 var loglevel = require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
@@ -22,6 +24,8 @@ var utils = require('../../base/utils.js');
 var index = require('../../base/wallet/index.js');
 var config = require('./config.js');
 var WalletConnectV2Provider = require('./WalletConnectV2Provider.js');
+var wcSolanaWallet = require('./wcSolanaWallet.js');
+var solana = require('../../base/wallet/solana.js');
 
 class WalletConnectV2Connector extends baseConnector.BaseConnector {
   constructor(options) {
@@ -39,6 +43,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     _defineProperty(this, "connector", null);
     _defineProperty(this, "activeSession", null);
     _defineProperty(this, "wcProvider", null);
+    _defineProperty(this, "_solanaWallet", null);
     _defineProperty(this, "analytics", void 0);
     this.connectorOptions = _objectSpread({}, options);
     const {
@@ -66,6 +71,9 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     }
     return null;
   }
+  get solanaWallet() {
+    return this._solanaWallet;
+  }
   set provider(_) {
     throw new Error("Not implemented");
   }
@@ -106,7 +114,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
         try {
           await this.onConnectHandler({
             chain: chainConfig,
-            getIdentityToken: options.getIdentityToken
+            getAuthTokenInfo: options.getAuthTokenInfo
           });
         } catch (error) {
           loglevel.log.error("wallet auto connect", error);
@@ -120,7 +128,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     super.checkConnectionRequirements();
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
@@ -171,18 +179,26 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       if (this.connected) {
         await this.onConnectHandler({
           chain: chainConfig,
-          getIdentityToken
+          getAuthTokenInfo
         });
-        return this.provider;
+        return {
+          ethereumProvider: this.provider,
+          solanaWallet: this._solanaWallet,
+          connectorName: this.name
+        };
       }
       if (this.status !== constants.CONNECTOR_STATUS.CONNECTING) {
         await this.createNewSession({
           chainConfig,
           trackCompletionEvents,
-          getIdentityToken
+          getAuthTokenInfo
         });
       }
-      return this.provider;
+      return {
+        ethereumProvider: this.provider,
+        solanaWallet: this._solanaWallet,
+        connectorName: this.name
+      };
     } catch (error) {
       loglevel.log.error("Wallet connect v2 connector error while connecting", error);
       // ready again to be connected
@@ -228,9 +244,11 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     if (!this.connector || !this.connected || !((_this$activeSession2 = this.activeSession) !== null && _this$activeSession2 !== void 0 && _this$activeSession2.topic)) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
     if (!options.sessionRemovedByWallet) await this.connector.disconnect({
       topic: (_this$activeSession3 = this.activeSession) === null || _this$activeSession3 === void 0 ? void 0 : _this$activeSession3.topic,
-      reason: utils$2.getSdkError("USER_DISCONNECTED")
+      reason: utils$1.getSdkError("USER_DISCONNECTED")
     });
+    await this.clearWalletSession();
     this.rehydrated = false;
+    this._solanaWallet = null;
     if (cleanup) {
       this.connector = null;
       this.status = constants.CONNECTOR_STATUS.NOT_READY;
@@ -240,9 +258,11 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       this.status = constants.CONNECTOR_STATUS.READY;
     }
     this.activeSession = null;
-    this.emit(constants.CONNECTOR_EVENTS.DISCONNECTED);
+    this.emit(constants.CONNECTOR_EVENTS.DISCONNECTED, {
+      connector: index.WALLET_CONNECTORS.WALLET_CONNECT_V2
+    });
   }
-  async getIdentityToken() {
+  async getAuthTokenInfo() {
     if (!this.provider || !this.canAuthorize) throw index$1.WalletLoginError.notConnectedError();
     this.status = constants.CONNECTOR_STATUS.AUTHORIZING;
     this.emit(constants.CONNECTOR_EVENTS.AUTHORIZING, {
@@ -256,52 +276,59 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     const {
       chainNamespace
     } = currentChainConfig;
-    const accounts = await this.provider.request({
-      method: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS : wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
+    const accounts = chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && this._solanaWallet ? this._solanaWallet.accounts.map(a => a.address) : await this.provider.request({
+      method: wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS
     });
     if (accounts && accounts.length > 0) {
-      const existingToken = utils$1.getSavedToken(accounts[0], this.name);
-      if (existingToken) {
-        const isExpired = utils$1.checkIfTokenIsExpired(existingToken);
-        if (!isExpired) {
-          this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
-          this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-            connector: index.WALLET_CONNECTORS.WALLET_CONNECT_V2,
-            identityTokenInfo: {
-              idToken: existingToken
-            }
-          });
-          return {
-            idToken: existingToken
-          };
-        }
-      }
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: Math.random().toString(36).slice(2),
-        issuedAt: new Date().toISOString()
-      };
-      const challenge = await baseControllers.signChallenge(payload, chainNamespace);
-      const signedMessage = await this._getSignedMessage(challenge, accounts, chainNamespace);
-      const idToken = await baseControllers.verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
-      utils$1.saveToken(accounts[0], this.name, idToken);
-      this.status = constants.CONNECTOR_STATUS.AUTHORIZED;
-      this.emit(constants.CONNECTOR_EVENTS.AUTHORIZED, {
-        connector: index.WALLET_CONNECTORS.WALLET_CONNECT_V2,
-        identityTokenInfo: {
-          idToken
-        }
+      const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0]);
+      if (cached) return cached;
+      const authServer = utils.citadelServerUrl(this.coreOptions.authBuildEnv);
+      const {
+        challenge,
+        signature
+      } = await this.generateChallengeAndSign(authServer, accounts);
+      return this.verifyAndAuthorize({
+        chainNamespace,
+        signedMessage: signature,
+        challenge,
+        authServer
       });
-      return {
-        idToken
-      };
     }
     throw index$1.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
   }
+  async generateChallengeAndSign(authServerUrl, accounts) {
+    const {
+      chainId
+    } = this.provider;
+    const currentChainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
+    if (!currentChainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
+    const {
+      chainNamespace
+    } = currentChainConfig;
+    const accountsToUse = accounts || (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && this._solanaWallet ? this._solanaWallet.accounts.map(a => a.address) : await this.provider.request({
+      method: wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS
+    }));
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw index$1.WalletLoginError.notConnectedError("No accounts found in the connected wallet");
+    }
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(chainId, 16),
+      version: "1",
+      nonce: siwe.generateSiweNonce(),
+      issuedAt: new Date().toISOString()
+    };
+    const authServer = authServerUrl || utils.citadelServerUrl(this.coreOptions.authBuildEnv);
+    const challenge = await baseControllers.signChallenge(payload, chainNamespace, authServer);
+    const signature = await this._getSignedMessage(challenge, accountsToUse, chainNamespace);
+    return {
+      challenge,
+      signature,
+      chainNamespace
+    };
+  }
   async enableMFA() {
     throw new Error("Method Not implemented");
   }
@@ -313,10 +340,10 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     const inactivePairings = this.connector.pairing.getAll({
       active: false
     });
-    if (!utils$2.isValidArray(inactivePairings)) return;
+    if (!utils$1.isValidArray(inactivePairings)) return;
     inactivePairings.forEach(pairing => {
       if (this.connector) {
-        this.connector.pairing.delete(pairing.topic, utils$2.getSdkError("USER_DISCONNECTED"));
+        this.connector.pairing.delete(pairing.topic, utils$1.getSdkError("USER_DISCONNECTED"));
       }
     });
   }
@@ -332,7 +359,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     forceNewSession = false,
     chainConfig,
     trackCompletionEvents,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     try {
       var _this$activeSession4, _this$connectorOption7;
@@ -346,7 +373,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
         var _this$activeSession5;
         await this.connector.disconnect({
           topic: (_this$activeSession5 = this.activeSession) === null || _this$activeSession5 === void 0 ? void 0 : _this$activeSession5.topic,
-          reason: utils$2.getSdkError("USER_DISCONNECTED")
+          reason: utils$1.getSdkError("USER_DISCONNECTED")
         });
       }
       const {
@@ -381,7 +408,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       await this.onConnectHandler({
         chain: chainConfig,
         trackCompletionEvents,
-        getIdentityToken
+        getAuthTokenInfo
       });
       if (qrcodeModal) {
         qrcodeModal.closeModal();
@@ -396,7 +423,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
           return this.createNewSession({
             forceNewSession: true,
             chainConfig,
-            getIdentityToken
+            getAuthTokenInfo
           });
         }
         if (this.status === constants.CONNECTOR_STATUS.READY) {
@@ -412,9 +439,9 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
   async onConnectHandler({
     chain,
     trackCompletionEvents,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
-    var _this$connectorOption8;
+    var _this$connectorOption8, _this$activeSession$n, _this$activeSession6;
     if (!this.connector || !this.wcProvider) throw index$1.WalletInitializationError.notReady("Wallet connect connector is not ready yet");
     this.subscribeEvents();
     if ((_this$connectorOption8 = this.connectorOptions.connectorSettings) !== null && _this$connectorOption8 !== void 0 && _this$connectorOption8.qrcodeModal) {
@@ -428,19 +455,30 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       });
     }
     await this.wcProvider.setupProvider(this.connector);
+    // Derive the active Solana chain from the WC session namespaces (genesis hash → hex chainId),
+    // rather than picking the first Solana chain from coreOptions which may not match the session.
+    const sessionSolanaChains = (_this$activeSession$n = (_this$activeSession6 = this.activeSession) === null || _this$activeSession6 === void 0 || (_this$activeSession6 = _this$activeSession6.namespaces) === null || _this$activeSession6 === void 0 || (_this$activeSession6 = _this$activeSession6.solana) === null || _this$activeSession6 === void 0 ? void 0 : _this$activeSession6.chains) !== null && _this$activeSession$n !== void 0 ? _this$activeSession$n : [];
+    if (sessionSolanaChains.length > 0) {
+      const reverseMap = Object.fromEntries(Object.entries(constants$1.SOLANA_CAIP_CHAIN_MAP).map(([hex, hash]) => [hash, hex]));
+      const genesisHash = sessionSolanaChains[0].split(":")[1];
+      const hexChainId = reverseMap[genesisHash];
+      const solanaChain = hexChainId ? this.coreOptions.chains.find(c => c.chainId === hexChainId) : null;
+      if (solanaChain) {
+        this._solanaWallet = await wcSolanaWallet.WCSolanaWallet.create(this.connector, solanaChain);
+      }
+    }
     this.cleanupPendingPairings();
     this.status = constants.CONNECTOR_STATUS.CONNECTED;
     // track connection events
     if (trackCompletionEvents) trackCompletionEvents();
-    let identityTokenInfo;
     this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
-      connector: index.WALLET_CONNECTORS.WALLET_CONNECT_V2,
+      connectorName: index.WALLET_CONNECTORS.WALLET_CONNECT_V2,
       reconnected: this.rehydrated,
-      provider: this.provider,
-      identityTokenInfo
+      ethereumProvider: this.provider,
+      solanaWallet: this._solanaWallet
     });
-    if (getIdentityToken) {
-      identityTokenInfo = await this.getIdentityToken();
+    if (getAuthTokenInfo) {
+      await this.getAuthTokenInfo();
     }
   }
   subscribeEvents() {
@@ -470,10 +508,10 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     this.connector.events.on("session_expire", ({
       topic
     }) => {
-      var _this$activeSession6;
+      var _this$activeSession7;
       // Session has expired -> clean up the session
       loglevel.log.info("Session expired event received for topic:", topic);
-      if (((_this$activeSession6 = this.activeSession) === null || _this$activeSession6 === void 0 ? void 0 : _this$activeSession6.topic) === topic) {
+      if (((_this$activeSession7 = this.activeSession) === null || _this$activeSession7 === void 0 ? void 0 : _this$activeSession7.topic) === topic) {
         this.disconnect({
           sessionRemovedByWallet: true
         }).catch(error => {
@@ -483,13 +521,13 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     });
   }
   async _getSignedMessage(challenge, accounts, chainNamespace) {
-    const signedMessage = await this.provider.request({
-      method: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.PERSONAL_SIGN : wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE,
-      params: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? [challenge, accounts[0]] : {
-        data: challenge
-      }
+    if (chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA && this._solanaWallet) {
+      return solana.walletSignMessage(this._solanaWallet, challenge, accounts[0]);
+    }
+    return this.provider.request({
+      method: wsEmbed.EVM_METHOD_TYPES.PERSONAL_SIGN,
+      params: [challenge, accounts[0]]
     });
-    return signedMessage;
   }
 }
 const walletConnectV2Connector = params => {

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/walletConnectV2Utils.js

@@ -1,25 +1,25 @@
 'use strict';
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var bs58 = require('@toruslabs/bs58');
 var ethereumControllers = require('@toruslabs/ethereum-controllers');
 var utils$1 = require('@walletconnect/utils');
 var auth = require('@web3auth/auth');
 var wsEmbed = require('@web3auth/ws-embed');
 require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
-require('../../base/loglevel.js');
+var loglevel = require('../../base/loglevel.js');
 require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 var index = require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
-var constants = require('../../base/constants.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var utils = require('./utils.js');
 
 async function getLastActiveSession(signClient) {
@@ -42,7 +42,16 @@ async function sendJrpcRequest(signClient, chainId, method, params) {
   }
   if (typeof window !== "undefined" && isMobileDevice()) {
     if (session.peer.metadata.redirect && session.peer.metadata.redirect.native) {
-      window.open(session.peer.metadata.redirect.native, "_blank");
+      const redirectUrl = session.peer.metadata.redirect.native;
+      try {
+        const parsedUrl = new URL(redirectUrl);
+        if (["javascript:", "data:", "vbscript:"].includes(parsedUrl.protocol)) {
+          throw new Error("Invalid redirect scheme");
+        }
+        window.open(parsedUrl.href, "_blank");
+      } catch (e) {
+        loglevel.log.error("Invalid redirect URL", e);
+      }
     }
   }
   return signClient.request({
@@ -69,6 +78,14 @@ async function getAccounts(signClient) {
   }
   throw index.WalletLoginError.connectionError("Failed to get accounts");
 }
+async function getSolanaAccounts(signClient) {
+  const session = await getLastActiveSession(signClient);
+  if (!session) {
+    throw auth.providerErrors.disconnected();
+  }
+  const accounts = utils$1.getAccountsFromNamespaces(session.namespaces);
+  return [...new Set(accounts.filter(add => add.startsWith("solana:")).map(add => utils$1.parseAccountId(add).address))];
+}
 function getEthProviderHandlers({
   connector,
   chainId
@@ -124,50 +141,6 @@ function getEthProviderHandlers({
     }
   };
 }
-function getSolProviderHandlers({
-  connector,
-  chainId
-}) {
-  return {
-    requestAccounts: async _ => {
-      return getAccounts(connector);
-    },
-    getPrivateKey: async () => {
-      throw auth.rpcErrors.methodNotSupported();
-    },
-    getSecretKey: async () => {
-      throw auth.rpcErrors.methodNotSupported();
-    },
-    getPublicKey: async () => {
-      throw auth.rpcErrors.methodNotSupported();
-    },
-    getAccounts: async _ => {
-      return getAccounts(connector);
-    },
-    signAllTransactions: async _ => {
-      throw auth.rpcErrors.methodNotSupported();
-    },
-    signAndSendTransaction: async _ => {
-      throw auth.rpcErrors.methodNotSupported();
-    },
-    signMessage: async req => {
-      const methodRes = await sendJrpcRequest(connector, `solana:${constants.SOLANA_CAIP_CHAIN_MAP[chainId]}`, wsEmbed.SOLANA_METHOD_TYPES.SIGN_MESSAGE, {
-        message: bs58.bs58.encode(Buffer.from(req.params.data, "utf-8"))
-      });
-      return methodRes.signature;
-    },
-    signTransaction: async req => {
-      const accounts = await getAccounts(connector);
-      if (accounts.length === 0) {
-        throw auth.providerErrors.disconnected();
-      }
-      const methodRes = await sendJrpcRequest(connector, `solana:${constants.SOLANA_CAIP_CHAIN_MAP[chainId]}`, wsEmbed.SOLANA_METHOD_TYPES.SIGN_TRANSACTION, {
-        transaction: req.params.message
-      });
-      return methodRes.signature;
-    }
-  };
-}
 async function switchChain({
   connector,
   chainId,
@@ -198,6 +171,6 @@ async function addChain({
 exports.addChain = addChain;
 exports.getAccounts = getAccounts;
 exports.getEthProviderHandlers = getEthProviderHandlers;
-exports.getSolProviderHandlers = getSolProviderHandlers;
+exports.getSolanaAccounts = getSolanaAccounts;
 exports.sendJrpcRequest = sendJrpcRequest;
 exports.switchChain = switchChain;