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

package/dist/lib.esm/connectors/injected-solana-connector/walletStandardConnector.js

@@ -1,14 +1,13 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { StandardConnect, StandardDisconnect } from '@wallet-standard/features';
-import { BaseSolanaConnector } from '../base-solana-connector/baseSolanaConnector.js';
-import { WalletStandardProvider } from '../../providers/solana-provider/providers/injectedProviders/walletStandardProvider.js';
-import { getSolanaChainByChainConfig } from '../../providers/solana-provider/providers/injectedProviders/utils.js';
 import { normalizeWalletName } from '../../base/utils.js';
+import { BaseSolanaConnector } from '../base-solana-connector/baseSolanaConnector.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { log } from '../../base/loglevel.js';
 import { WalletLoginError } from '../../base/errors/index.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { getSolanaChainByChainConfig } from '../../base/wallet/solana.js';
 
 class WalletStandardConnector extends BaseSolanaConnector {
   constructor(options) {
@@ -20,7 +19,6 @@ class WalletStandardConnector extends BaseSolanaConnector {
     _defineProperty(this, "isInjected", true);
     _defineProperty(this, "status", CONNECTOR_STATUS.NOT_READY);
     _defineProperty(this, "wallet", null);
-    _defineProperty(this, "injectedProvider", null);
     this.name = options.name;
     this.icon = options.wallet.icon;
     // in VueJS, for some wallets e.g. Gate, Solflare, when connecting it throws error "attempted to get private field on non-instance"
@@ -28,11 +26,8 @@ class WalletStandardConnector extends BaseSolanaConnector {
     // ref: https://stackoverflow.com/questions/64917686/vue-array-converted-to-proxy-object
     this.wallet = ["gate", "solflare"].includes(this.name) ? Object.freeze(options.wallet) : options.wallet;
   }
-  get provider() {
-    if (this.status !== CONNECTOR_STATUS.NOT_READY && this.injectedProvider) {
-      return this.injectedProvider;
-    }
-    return null;
+  get solanaWallet() {
+    return this.wallet;
   }
   get isWalletConnected() {
     return !!(this.connected && this.wallet.accounts.length > 0);
@@ -43,24 +38,17 @@ class WalletStandardConnector extends BaseSolanaConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    this.injectedProvider = new WalletStandardProvider({
-      config: {
-        chain: chainConfig,
-        chains: this.coreOptions.chains
-      }
-    });
-    await this.injectedProvider.setupProvider(this.wallet, options.chainId);
     this.status = CONNECTOR_STATUS.READY;
     this.emit(CONNECTOR_EVENTS.READY, this.name);
     try {
       log.debug("initializing solana injected connector");
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({
+        const connection = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: options.getIdentityToken
+          getAuthTokenInfo: options.getAuthTokenInfo
         });
-        if (!provider) {
+        if (!connection) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");
         }
@@ -71,7 +59,7 @@ class WalletStandardConnector extends BaseSolanaConnector {
   }
   async connect({
     chainId,
-    getIdentityToken
+    getAuthTokenInfo
   }) {
     try {
       super.checkConnectionRequirements();
@@ -88,17 +76,20 @@ class WalletStandardConnector extends BaseSolanaConnector {
       }
       if (this.wallet.accounts.length === 0) throw WalletLoginError.connectionError();
       this.status = CONNECTOR_STATUS.CONNECTED;
-      let identityTokenInfo;
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
-        connector: this.name,
+        connectorName: this.name,
         reconnected: this.rehydrated,
-        provider: this.provider,
-        identityTokenInfo
+        ethereumProvider: null,
+        solanaWallet: this.solanaWallet
       });
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
+      if (getAuthTokenInfo) {
+        await this.getAuthTokenInfo();
       }
-      return this.provider;
+      return {
+        ethereumProvider: null,
+        solanaWallet: this.solanaWallet,
+        connectorName: this.name
+      };
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
@@ -116,7 +107,6 @@ class WalletStandardConnector extends BaseSolanaConnector {
       await ((_this$wallet$features = this.wallet.features[StandardDisconnect]) === null || _this$wallet$features === void 0 ? void 0 : _this$wallet$features.disconnect());
       if (options.cleanup) {
         this.status = CONNECTOR_STATUS.NOT_READY;
-        this.injectedProvider = null;
       } else {
         this.status = CONNECTOR_STATUS.READY;
       }
@@ -129,10 +119,8 @@ class WalletStandardConnector extends BaseSolanaConnector {
     if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
-  async switchChain(params, init = false) {
-    var _this$injectedProvide;
-    super.checkSwitchChainRequirements(params, init);
-    await ((_this$injectedProvide = this.injectedProvider) === null || _this$injectedProvide === void 0 ? void 0 : _this$injectedProvide.switchChain(params));
+  async switchChain(_params, _init = false) {
+    throw WalletLoginError.unsupportedOperation("Injected Solana wallets do not support chain switching.");
   }
   async enableMFA() {
     throw new Error("Method not implemented.");