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

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

@@ -1,12 +1,12 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { StandardConnect, StandardDisconnect } from '@wallet-standard/features';
-import { BaseSolanaConnector } from '../base-solana-connector/baseSolanaConnector.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 {

package/dist/lib.esm/connectors/metamask-connector/metamaskConnector.js

@@ -9,14 +9,14 @@ import { StandardConnect } from '@wallet-standard/features';
 import { EVM_METHOD_TYPES } from '@web3auth/ws-embed';
 import { generateSiweNonce } from 'viem/siwe';
 import { getSiteName } from '../utils.js';
-import { ANALYTICS_EVENTS } from '../../base/analytics.js';
-import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
 import { getCaipChainId, citadelServerUrl } from '../../base/utils.js';
-import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 import { WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
+import { ANALYTICS_EVENTS } from '../../base/analytics.js';
+import { BaseConnector } from '../../base/connector/baseConnector.js';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
+import { getSolanaChainByChainConfig, walletSignMessage } from '../../base/wallet/solana.js';
 
 /**
  * Configuration options for the MetaMask connector using \@metamask/connect-evm
@@ -175,14 +175,16 @@ class MetaMaskConnector extends BaseConnector {
     if (coreStatus === "connected") {
       this.status = CONNECTOR_STATUS.CONNECTED;
       this.rehydrated = true;
-      this.emit(CONNECTOR_EVENTS.CONNECTED, {
-        connectorName: WALLET_CONNECTORS.METAMASK,
-        reconnected: this.rehydrated,
-        ethereumProvider: this.evmProvider,
-        solanaWallet: this.solanaProvider
-      });
-      if (options.getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
+      if (options.autoConnect) {
+        this.emit(CONNECTOR_EVENTS.CONNECTED, {
+          connectorName: WALLET_CONNECTORS.METAMASK,
+          reconnected: this.rehydrated,
+          ethereumProvider: this.evmProvider,
+          solanaWallet: this.solanaProvider
+        });
+        if (options.getAuthTokenInfo) {
+          await this.getAuthTokenInfo();
+        }
       }
     } else if (coreStatus === "loaded" || coreStatus === "disconnected") {
       this.status = CONNECTOR_STATUS.READY;
@@ -204,13 +206,15 @@ class MetaMaskConnector extends BaseConnector {
   }
   async connect({
     chainId,
-    getAuthTokenInfo
+    getAuthTokenInfo,
+    caipAccountIds: caipAccountIdsFromParams
   }) {
     super.checkConnectionRequirements();
     await this.ensureInitialized();
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
     if (!chainConfig) throw WalletLoginError.connectionError("Chain config is not available");
     const scopes = this.coreOptions.chains.map(c => getCaipChainId(c));
+    const caipAccountIds = caipAccountIdsFromParams || [];
 
     // Skip tracking for rehydration since only new connections are tracked
     const shouldTrack = !this.rehydrated;
@@ -238,7 +242,7 @@ class MetaMaskConnector extends BaseConnector {
         });
 
         // Connect using the multichain client
-        await this.multichainClient.connect(scopes, [], {
+        await this.multichainClient.connect(scopes, caipAccountIds, {
           solana_accountChanged_notifications: true
         });
 
@@ -330,7 +334,9 @@ class MetaMaskConnector extends BaseConnector {
       this.status = CONNECTOR_STATUS.READY;
     }
     this.rehydrated = false;
-    this.emit(CONNECTOR_EVENTS.DISCONNECTED);
+    this.emit(CONNECTOR_EVENTS.DISCONNECTED, {
+      connector: WALLET_CONNECTORS.METAMASK
+    });
   }
   async getAuthTokenInfo() {
     var _this$evmProvider2, _this$coreOptions$cha;
@@ -341,10 +347,6 @@ class MetaMaskConnector extends BaseConnector {
     const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
     const activeChainConfig = isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
     if (!activeChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
-    this.status = CONNECTOR_STATUS.AUTHORIZING;
-    this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
-      connector: WALLET_CONNECTORS.METAMASK
-    });
     const {
       chainNamespace
     } = activeChainConfig;
@@ -354,37 +356,22 @@ class MetaMaskConnector extends BaseConnector {
     if (accounts && accounts.length > 0) {
       const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0]);
       if (cached) return cached;
-      const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(activeChainConfig.chainId, 16),
-        version: "1",
-        nonce: generateSiweNonce(),
-        issuedAt: new Date().toISOString()
-      };
-      const challenge = await signChallenge(payload, chainNamespace, authServer);
-      let signedMessage;
-      if (chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider) {
-        signedMessage = await walletSignMessage(this.solanaProvider, challenge, accounts[0]);
-      } else if (this.evmProvider) {
-        const hexChallenge = bytesToHexPrefixedString(utf8ToBytes(challenge));
-        signedMessage = await this.evmProvider.request({
-          method: EVM_METHOD_TYPES.PERSONAL_SIGN,
-          params: [hexChallenge, accounts[0]]
-        });
-      } else {
-        throw WalletLoginError.notConnectedError("No provider available for signing");
-      }
-      return this.verifyAndAuthorize({
-        chainNamespace,
-        signedMessage,
-        challenge,
-        authServer
-      });
     }
-    throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, {
+      connector: WALLET_CONNECTORS.METAMASK
+    });
+    const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
+    const {
+      challenge,
+      signature
+    } = await this.generateChallengeAndSign(authServer, accounts);
+    return this.verifyAndAuthorize({
+      chainNamespace,
+      signedMessage: signature,
+      challenge,
+      authServer
+    });
   }
   async getUserInfo() {
     if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
@@ -419,6 +406,50 @@ class MetaMaskConnector extends BaseConnector {
       chainConfiguration
     });
   }
+  async generateChallengeAndSign(authServerUrl, accounts) {
+    var _this$evmProvider3, _this$coreOptions$cha2;
+    const evmChainId = ((_this$evmProvider3 = this.evmProvider) === null || _this$evmProvider3 === void 0 ? void 0 : _this$evmProvider3.chainId) || ((_this$coreOptions$cha2 = this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.EIP155)) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.chainId);
+    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
+    const activeChainConfig = isSolanaOnly ? this.coreOptions.chains.find(x => x.chainNamespace === CHAIN_NAMESPACES.SOLANA) : this.evmProvider ? this.coreOptions.chains.find(x => x.chainId === evmChainId) : undefined;
+    if (!activeChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
+    const {
+      chainNamespace
+    } = activeChainConfig;
+    const accountsToUse = accounts || (chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider ? this.solanaProvider.accounts.map(a => a.address) : this.evmProvider ? await this.evmProvider.request({
+      method: EVM_METHOD_TYPES.GET_ACCOUNTS
+    }) : []);
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    }
+    const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(activeChainConfig.chainId, 16),
+      version: "1",
+      nonce: generateSiweNonce(),
+      issuedAt: new Date().toISOString()
+    };
+    const challenge = await signChallenge(payload, chainNamespace, authServer);
+    let signedMessage;
+    if (chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider) {
+      signedMessage = await walletSignMessage(this.solanaProvider, challenge, accountsToUse[0]);
+    } else if (this.evmProvider) {
+      const hexChallenge = bytesToHexPrefixedString(utf8ToBytes(challenge));
+      signedMessage = await this.evmProvider.request({
+        method: EVM_METHOD_TYPES.PERSONAL_SIGN,
+        params: [hexChallenge, accountsToUse[0]]
+      });
+    } else {
+      throw WalletLoginError.notConnectedError("No provider available for signing");
+    }
+    return {
+      challenge,
+      signature: signedMessage,
+      chainNamespace
+    };
+  }
   async enableMFA() {
     throw new Error("Method Not implemented");
   }

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

@@ -5,10 +5,10 @@ import { providerErrors, JRPCEngineV2, providerFromEngineV2 } from '@web3auth/au
 import { formatChainId } from './utils.js';
 import { switchChain, addChain, getAccounts, getEthProviderHandlers } from './walletConnectV2Utils.js';
 import { BaseProvider } from '../../providers/base-provider/baseProvider.js';
-import { createEthMiddleware, createEthChainSwitchMiddleware } from '../../providers/ethereum-provider/rpc/ethRpcMiddlewares.js';
-import { createEthJsonRpcClient } from '../../providers/ethereum-provider/rpc/jrpcClient.js';
 import { WalletLoginError } from '../../base/errors/index.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { createEthMiddleware, createEthChainSwitchMiddleware } from '../../providers/ethereum-provider/rpc/ethRpcMiddlewares.js';
+import { createEthJsonRpcClient } from '../../providers/ethereum-provider/rpc/jrpcClient.js';
 import { log } from '../../base/loglevel.js';
 
 var _WalletConnectV2Provider;

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

@@ -9,15 +9,15 @@ import { generateSiweNonce } from 'viem/siwe';
 import { getWalletConnectV2Settings } from './config.js';
 import { WalletConnectV2Provider } from './WalletConnectV2Provider.js';
 import { WCSolanaWallet } from './wcSolanaWallet.js';
-import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
-import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { WalletInitializationError, WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
 import { log } from '../../base/loglevel.js';
 import { getCaipChainId, citadelServerUrl } from '../../base/utils.js';
 import { ANALYTICS_EVENTS } from '../../base/analytics.js';
 import { SOLANA_CAIP_CHAIN_MAP } from '../../base/constants.js';
+import { BaseConnector } from '../../base/connector/baseConnector.js';
+import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { walletSignMessage } from '../../base/wallet/solana.js';
 
 class WalletConnectV2Connector extends BaseConnector {
@@ -254,7 +254,9 @@ class WalletConnectV2Connector extends BaseConnector {
       this.status = CONNECTOR_STATUS.READY;
     }
     this.activeSession = null;
-    this.emit(CONNECTOR_EVENTS.DISCONNECTED);
+    this.emit(CONNECTOR_EVENTS.DISCONNECTED, {
+      connector: WALLET_CONNECTORS.WALLET_CONNECT_V2
+    });
   }
   async getAuthTokenInfo() {
     if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
@@ -276,27 +278,53 @@ class WalletConnectV2Connector extends BaseConnector {
     if (accounts && accounts.length > 0) {
       const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0]);
       if (cached) return cached;
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: generateSiweNonce(),
-        issuedAt: new Date().toISOString()
-      };
       const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
-      const challenge = await signChallenge(payload, chainNamespace, authServer);
-      const signedMessage = await this._getSignedMessage(challenge, accounts, chainNamespace);
+      const {
+        challenge,
+        signature
+      } = await this.generateChallengeAndSign(authServer, accounts);
       return this.verifyAndAuthorize({
         chainNamespace,
-        signedMessage: signedMessage,
+        signedMessage: signature,
         challenge,
         authServer
       });
     }
     throw 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 WalletLoginError.connectionError("Chain config is not available");
+    const {
+      chainNamespace
+    } = currentChainConfig;
+    const accountsToUse = accounts || (chainNamespace === CHAIN_NAMESPACES.SOLANA && this._solanaWallet ? this._solanaWallet.accounts.map(a => a.address) : await this.provider.request({
+      method: EVM_METHOD_TYPES.GET_ACCOUNTS
+    }));
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw 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: generateSiweNonce(),
+      issuedAt: new Date().toISOString()
+    };
+    const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
+    const challenge = await signChallenge(payload, chainNamespace, authServer);
+    const signature = await this._getSignedMessage(challenge, accountsToUse, chainNamespace);
+    return {
+      challenge,
+      signature,
+      chainNamespace
+    };
+  }
   async enableMFA() {
     throw new Error("Method Not implemented");
   }

package/dist/lib.esm/connectors/wallet-connect-v2-connector/wcSolanaWallet.js

@@ -6,8 +6,8 @@ import { StandardEvents, StandardDisconnect, StandardConnect } from '@wallet-sta
 import { SOLANA_METHOD_TYPES } from '@web3auth/ws-embed';
 import { sendJrpcRequest, getSolanaAccounts } from './walletConnectV2Utils.js';
 import { WEB3AUTH_ICON } from '../../base/wallet/index.js';
-import { getSolanaChainByChainConfig } from '../../base/wallet/solana.js';
 import { SOLANA_CAIP_CHAIN_MAP } from '../../base/constants.js';
+import { getSolanaChainByChainConfig } from '../../base/wallet/solana.js';
 
 const base58Encoder = getBase58Encoder();
 const base58Decoder = getBase58Decoder();

package/dist/lib.esm/index.js

@@ -1,6 +1,7 @@
 export { Web3AuthNoModal } from './noModal.js';
 export { ANALYTICS_EVENTS, ANALYTICS_INTEGRATION_TYPE, ANALYTICS_SDK_TYPE, Analytics } from './base/analytics.js';
 export { AUTH_CONNECTION, MFA_FACTOR, MFA_LEVELS, UX_MODE, WEB3AUTH_NETWORK, getED25519Key } from '@web3auth/auth';
+export { AccountLinkingError, WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError } from './base/errors/index.js';
 export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
 export { BaseConnector } from './base/connector/baseConnector.js';
 export { BaseEvmConnector } from './connectors/base-evm-connector/baseEvmConnector.js';
@@ -20,13 +21,12 @@ export { EIP_7702_SUPPORTED_SMART_ACCOUNTS, LOGIN_MODE, MODAL_SIGN_IN_METHODS, S
 export { EVM_PLUGINS, PLUGIN_EVENTS, PLUGIN_NAMESPACES, PLUGIN_STATUS, SOLANA_PLUGINS, WALLET_PLUGINS } from './base/plugin/IPlugin.js';
 export { PROVIDER_EVENTS } from './base/provider/IProvider.js';
 export { WalletConnectV2Provider } from './connectors/wallet-connect-v2-connector/WalletConnectV2Provider.js';
-export { WalletInitializationError, WalletLoginError, WalletOperationsError, WalletProviderError, Web3AuthError } from './base/errors/index.js';
 export { WalletServicesPluginError } from './base/plugin/errors.js';
 export { Web3AuthContextKey } from './base/composables/index.js';
 export { accountAbstractionProvider, toEoaProvider } from './providers/account-abstraction-provider/providers/AccountAbstractionProvider.js';
-export { authConnector } from './connectors/auth-connector/authConnector.js';
+export { assertAuthConnector, authConnector, isAuthConnector } from './connectors/auth-connector/authConnector.js';
 export { checkIfTokenIsExpired, storageAvailable } from './base/connector/utils.js';
-export { citadelServerUrl, dashboardPublicApiUrl, fetchProjectConfig, fetchWalletRegistry, fromViemChain, fromWagmiChain, getAaAnalyticsProperties, getCaipChainId, getErrorAnalyticsProperties, getHostname, getWalletServicesAnalyticsProperties, getWhitelabelAnalyticsProperties, isBrowser, isHexStrict, normalizeWalletName, sdkVersion, withAbort } from './base/utils.js';
+export { citadelServerUrl, dashboardPublicApiUrl, fetchProjectConfig, fetchWalletRegistry, fromViemChain, fromWagmiChain, getAaAnalyticsProperties, getCaipChainId, getErrorAnalyticsProperties, getHostname, getWalletServicesAnalyticsProperties, getWhitelabelAnalyticsProperties, isBrowser, isHexStrict, normalizeWalletName, parseChainNamespaceFromCitadelResponse, sdkVersion, withAbort } from './base/utils.js';
 export { cookieToWeb3AuthState } from './base/cookie.js';
 export { createEthChainSwitchMiddleware, createEthMiddleware } from './providers/ethereum-provider/rpc/ethRpcMiddlewares.js';
 export { createEthJsonRpcClient } from './providers/ethereum-provider/rpc/jrpcClient.js';
@@ -37,6 +37,7 @@ export { getSolanaChainByChainConfig, walletSignAndSendTransaction, walletSignMe
 export { hasSolanaWalletStandardFeatures } from './connectors/injected-solana-connector/index.js';
 export { injectedEvmConnector } from './connectors/injected-evm-connector/injectedEvmConnector.js';
 export { log } from './base/loglevel.js';
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from './account-linking/rest.js';
 export { metaMaskConnector } from './connectors/metamask-connector/metamaskConnector.js';
 export { walletConnectV2Connector } from './connectors/wallet-connect-v2-connector/walletConnectV2Connector.js';
 export { walletServicesPlugin } from './plugins/wallet-services-plugin/plugin.js';