@web3auth/no-modal 10.0.0-beta.9 → 10.0.0

package/dist/lib.esm/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -26,6 +26,7 @@ class AccountAbstractionProvider extends BaseProvider {
     _defineProperty(this, "_publicClient", void 0);
     _defineProperty(this, "_bundlerClient", void 0);
     _defineProperty(this, "_paymasterClient", void 0);
+    _defineProperty(this, "_useProviderAsTransport", void 0);
     this.update({
       chainId: config.chain.chainId
     });
@@ -112,13 +113,13 @@ class AccountAbstractionProvider extends BaseProvider {
     if (paymasterConfig) {
       var _paymasterConfig$tran;
       this._paymasterClient = createPaymasterClient(_objectSpread(_objectSpread({}, paymasterConfig), {}, {
-        transport: (_paymasterConfig$tran = paymasterConfig.transport) !== null && _paymasterConfig$tran !== void 0 ? _paymasterConfig$tran : http(paymasterConfig.url)
+        transport: this._useProviderAsTransport ? custom(eoaProvider) : (_paymasterConfig$tran = paymasterConfig.transport) !== null && _paymasterConfig$tran !== void 0 ? _paymasterConfig$tran : http(paymasterConfig.url)
       }));
     }
     this._bundlerClient = createBundlerClient(_objectSpread(_objectSpread({}, bundlerConfig), {}, {
       account: this.smartAccount,
       client: this._publicClient,
-      transport: (_bundlerConfig$transp = bundlerConfig.transport) !== null && _bundlerConfig$transp !== void 0 ? _bundlerConfig$transp : http(bundlerConfig.url),
+      transport: this._useProviderAsTransport ? custom(eoaProvider) : (_bundlerConfig$transp = bundlerConfig.transport) !== null && _bundlerConfig$transp !== void 0 ? _bundlerConfig$transp : http(bundlerConfig.url),
       paymaster: this._paymasterClient
     }));
     const providerHandlers = getProviderHandlers({
@@ -165,6 +166,7 @@ _defineProperty(AccountAbstractionProvider, "getProviderInstance", async params
   const providerInstance = new _AccountAbstractionProvider({
     config: params
   });
+  providerInstance._useProviderAsTransport = params.useProviderAsTransport;
   await providerInstance.setupProvider(params.eoaProvider);
   providerInstance.update({
     eoaProvider: params.eoaProvider
@@ -175,7 +177,8 @@ const accountAbstractionProvider = async ({
   accountAbstractionConfig,
   chain,
   chains,
-  provider
+  provider,
+  useProviderAsTransport
 }) => {
   let smartAccountInit;
   const {
@@ -242,7 +245,8 @@ const accountAbstractionProvider = async ({
     smartAccountInit,
     chain,
     chains,
-    smartAccountChainsConfig
+    smartAccountChainsConfig,
+    useProviderAsTransport
   });
 };
 const toEoaProvider = async aaProvider => {

package/dist/lib.esm/react/context/Web3AuthInnerContext.js

@@ -1,5 +1,6 @@
-import { createContext, useState, useCallback, useEffect, useMemo, createElement } from 'react';
+import { createContext, useMemo, useState, useCallback, useEffect, createElement } from 'react';
 import { Web3AuthNoModal } from '../../noModal.js';
+import { ANALYTICS_INTEGRATION_TYPE } from '../../base/analytics.js';
 import { WalletInitializationError } from '../../base/errors/index.js';
 import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../../base/connector/constants.js';
 
@@ -7,9 +8,16 @@ const Web3AuthInnerContext = createContext(null);
 function Web3AuthInnerProvider(params) {
   const {
     children,
-    config
+    config,
+    initialState
   } = params;
-  const [web3Auth, setWeb3Auth] = useState(null);
+  const {
+    web3AuthOptions
+  } = config;
+  const web3Auth = useMemo(() => {
+    setProvider(null);
+    return new Web3AuthNoModal(web3AuthOptions, initialState);
+  }, [web3AuthOptions, initialState]);
   const [isInitializing, setIsInitializing] = useState(false);
   const [initError, setInitError] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
@@ -21,25 +29,15 @@ function Web3AuthInnerProvider(params) {
     if (!web3Auth) throw WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
   }, [web3Auth]);
-  useEffect(() => {
-    const resetHookState = () => {
-      setProvider(null);
-      setIsConnected(false);
-      setStatus(null);
-    };
-    resetHookState();
-    const {
-      web3AuthOptions
-    } = config;
-    const web3Instance = new Web3AuthNoModal(web3AuthOptions);
-    setWeb3Auth(web3Instance);
-  }, [config]);
   useEffect(() => {
     const controller = new AbortController();
     async function init() {
       try {
         setInitError(null);
         setIsInitializing(true);
+        web3Auth.setAnalyticsProperties({
+          integration_type: ANALYTICS_INTEGRATION_TYPE.REACT_HOOKS
+        });
         await web3Auth.init({
           signal: controller.signal
         });
@@ -78,7 +76,12 @@ function Web3AuthInnerProvider(params) {
       setStatus(web3Auth.status);
     };
     const errorListener = () => {
-      setStatus(CONNECTOR_STATUS.ERRORED);
+      setStatus(web3Auth.status);
+    };
+    const rehydrationErrorListener = () => {
+      setStatus(web3Auth.status);
+      setIsConnected(false);
+      setProvider(null);
     };
     const mfaEnabledListener = isMFAEnabled => {
       if (typeof isMFAEnabled === "boolean") setIsMFAEnabled(isMFAEnabled);
@@ -92,6 +95,7 @@ function Web3AuthInnerProvider(params) {
       web3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
       web3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
       web3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
+      web3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
       web3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
     }
     return () => {
@@ -102,6 +106,7 @@ function Web3AuthInnerProvider(params) {
         web3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         web3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         web3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
+        web3Auth.off(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
         web3Auth.off(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       }
     };

package/dist/lib.esm/react/hooks/useIdentityToken.js

@@ -9,11 +9,11 @@ const useIdentityToken = () => {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
   const [token, setToken] = useState(null);
-  const authenticateUser = useCallback(async () => {
+  const getIdentityToken = useCallback(async () => {
     setLoading(true);
     setError(null);
     try {
-      const userAuthInfo = await web3Auth.authenticateUser();
+      const userAuthInfo = await web3Auth.getIdentityToken();
       if (userAuthInfo !== null && userAuthInfo !== void 0 && userAuthInfo.idToken) {
         setToken(userAuthInfo.idToken);
       }
@@ -33,7 +33,7 @@ const useIdentityToken = () => {
     loading,
     error,
     token,
-    authenticateUser
+    getIdentityToken
   };
 };
 

package/dist/lib.esm/react/wagmi/constants.js

@@ -0,0 +1,14 @@
+import { createConfig, http } from 'wagmi';
+import { mainnet } from 'wagmi/chains';
+
+const defaultWagmiConfig = createConfig({
+  chains: [mainnet],
+  connectors: [],
+  // or your basic wallets
+  ssr: true,
+  transports: {
+    [mainnet.id]: http(mainnet.rpcUrls.default.http[0])
+  }
+});
+
+export { defaultWagmiConfig };

package/dist/lib.esm/react/wagmi/provider.js

@@ -1,11 +1,14 @@
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { useMemo, createElement, useEffect, Fragment } from 'react';
-import { defineChain, webSocket, http } from 'viem';
-import { createConfig, WagmiProvider as WagmiProvider$1, useConfig, useAccountEffect } from 'wagmi';
+import { defineChain } from 'viem';
+import { webSocket, http, createConfig, WagmiProvider as WagmiProvider$1, useConfig, useReconnect, useAccountEffect } from 'wagmi';
 import { injected } from 'wagmi/connectors';
+import { defaultWagmiConfig } from './constants.js';
 import { useWeb3Auth } from '../hooks/useWeb3Auth.js';
 import { useWeb3AuthDisconnect } from '../hooks/useWeb3AuthDisconnect.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { WalletInitializationError } from '../../base/errors/index.js';
 import { log } from '../../base/loglevel.js';
 
 const _excluded = ["children"];
@@ -71,6 +74,9 @@ function Web3AuthWagmiProvider({
     disconnect
   } = useWeb3AuthDisconnect();
   const wagmiConfig = useConfig();
+  const {
+    reconnect
+  } = useReconnect();
   useAccountEffect({
     onDisconnect: async () => {
       log.info("Disconnected from wagmi");
@@ -85,13 +91,14 @@ function Web3AuthWagmiProvider({
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        reconnect();
       } else if (!isConnected) {
         if (wagmiConfig.state.status === "connected") {
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
         }
       }
     })();
-  }, [isConnected, wagmiConfig, provider]);
+  }, [isConnected, wagmiConfig, provider, reconnect]);
   return createElement(Fragment, null, children);
 }
 function WagmiProvider(_ref) {
@@ -108,6 +115,7 @@ function WagmiProvider(_ref) {
   } = useWeb3Auth();
   const finalConfig = useMemo(() => {
     var _web3Auth$coreOptions;
+    if (!isInitialized) return defaultWagmiConfig;
     const finalConfig = _objectSpread(_objectSpread({
       ssr: true
     }, config), {}, {
@@ -121,7 +129,8 @@ function WagmiProvider(_ref) {
     if (isInitialized && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$coreOptions = web3Auth.coreOptions) !== null && _web3Auth$coreOptions !== void 0 && _web3Auth$coreOptions.chains) {
       var _web3Auth$currentChai;
       const defaultChainId = (_web3Auth$currentChai = web3Auth.currentChain) === null || _web3Auth$currentChai === void 0 ? void 0 : _web3Auth$currentChai.chainId;
-      const chains = web3Auth.coreOptions.chains;
+      const chains = web3Auth.coreOptions.chains.filter(chain => chain.chainNamespace === CHAIN_NAMESPACES.EIP155);
+      if (chains.length === 0) throw WalletInitializationError.invalidParams("No valid chains found in web3auth config for wagmi.");
       chains.forEach(chain => {
         const wagmiChain = defineChain({
           id: Number.parseInt(chain.chainId, 16),
@@ -158,10 +167,6 @@ function WagmiProvider(_ref) {
     if (!finalConfig.chains) return;
     return createConfig(finalConfig);
   }, [config, web3Auth, isInitialized]);
-
-  // WagmiProviderBase requires a config to initialize
-  // If no config is provided, it will throw an error.
-  if (!finalConfig) return null;
   return createElement(WagmiProvider$1, // typecast to WagmiProviderPropsBase to avoid type error
   // as we are omitting the config prop from WagmiProviderProps
   // and creating a new config object with the finalConfig

package/dist/lib.esm/vue/Web3AuthProvider.js

@@ -1,6 +1,7 @@
 import { defineComponent, h, shallowRef, ref, watch, provide } from 'vue';
 import { Web3AuthNoModal } from '../noModal.js';
 import { WalletServicesInnerProvider } from './WalletServicesInnerProvider.js';
+import { ANALYTICS_INTEGRATION_TYPE } from '../base/analytics.js';
 import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../base/connector/constants.js';
 import { Web3AuthContextKey } from '../base/composables/index.js';
 import { WalletInitializationError } from '../base/errors/index.js';
@@ -46,6 +47,9 @@ const Web3AuthProvider = defineComponent({
         web3AuthOptions
       } = newConfig;
       const web3AuthInstance = new Web3AuthNoModal(web3AuthOptions);
+      web3AuthInstance.setAnalyticsProperties({
+        integration_type: ANALYTICS_INTEGRATION_TYPE.VUE_COMPOSABLES
+      });
       web3Auth.value = web3AuthInstance;
     }, {
       immediate: true
@@ -100,7 +104,7 @@ const Web3AuthProvider = defineComponent({
         status.value = web3Auth.value.status;
       };
       const errorListener = () => {
-        status.value = CONNECTOR_EVENTS.ERRORED;
+        status.value = web3Auth.value.status;
       };
       const mfaEnabledListener = () => {
         isMFAEnabled.value = true;
@@ -114,6 +118,7 @@ const Web3AuthProvider = defineComponent({
         prevWeb3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         prevWeb3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
+        prevWeb3Auth.off(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
         prevWeb3Auth.off(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       }
       if (newWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
@@ -125,6 +130,7 @@ const Web3AuthProvider = defineComponent({
         newWeb3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       }
     }, {

package/dist/lib.esm/vue/composables/useIdentityToken.js

@@ -10,12 +10,12 @@ const useIdentityToken = () => {
   const loading = ref(false);
   const error = ref(null);
   const token = ref(null);
-  const authenticateUser = async () => {
+  const getIdentityToken = async () => {
     try {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       error.value = null;
       loading.value = true;
-      const result = await web3Auth.value.authenticateUser();
+      const result = await web3Auth.value.getIdentityToken();
       if (result !== null && result !== void 0 && result.idToken) {
         token.value = result.idToken;
       }
@@ -35,7 +35,7 @@ const useIdentityToken = () => {
     loading,
     error,
     token,
-    authenticateUser
+    getIdentityToken
   };
 };
 

package/dist/lib.esm/vue/composables/useManageMFA.js

@@ -13,7 +13,7 @@ const useManageMFA = () => {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
       error.value = null;
       loading.value = true;
-      await web3Auth.value.enableMFA();
+      await web3Auth.value.manageMFA();
     } catch (err) {
       error.value = err;
     } finally {

package/dist/lib.esm/vue/solana/composables/useSolanaWallet.js

@@ -12,29 +12,33 @@ const useSolanaWallet = () => {
   const accounts = ref([]);
   const solanaWallet = shallowRef(null);
   const connection = shallowRef(null);
-  watch(provider, async newVal => {
-    var _web3Auth$value, _accounts$value;
+  const setupWallet = async () => {
+    var _web3Auth$value, _web3Auth$value2;
     if (!((_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.currentChain) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chainNamespace) || web3Auth.value.currentChain.chainNamespace !== CHAIN_NAMESPACES.SOLANA) {
       return;
     }
+    solanaWallet.value = new SolanaWallet(provider.value);
+    const result = await solanaWallet.value.requestAccounts();
+    if ((result === null || result === void 0 ? void 0 : result.length) > 0) {
+      accounts.value = result;
+    }
+    connection.value = new Connection((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || (_web3Auth$value2 = _web3Auth$value2.currentChain) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.rpcTarget);
+  };
+  if (provider.value && !solanaWallet.value) {
+    setupWallet();
+  }
+  watch(provider, async newVal => {
     if (!newVal && solanaWallet.value) {
       solanaWallet.value = null;
       accounts.value = null;
+      connection.value = null;
       return;
     }
-    if (!solanaWallet.value) {
-      solanaWallet.value = new SolanaWallet(newVal);
-    }
-    if (((_accounts$value = accounts.value) === null || _accounts$value === void 0 ? void 0 : _accounts$value.length) === 0) {
-      const result = await solanaWallet.value.requestAccounts();
-      if ((result === null || result === void 0 ? void 0 : result.length) > 0) {
-        accounts.value = result;
-      }
-    }
-    if (solanaWallet.value && !connection.value) {
-      var _web3Auth$value2;
-      connection.value = new Connection((_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || (_web3Auth$value2 = _web3Auth$value2.currentChain) === null || _web3Auth$value2 === void 0 ? void 0 : _web3Auth$value2.rpcTarget);
+    if (newVal && !solanaWallet.value) {
+      setupWallet();
     }
+  }, {
+    immediate: true
   });
   return {
     solanaWallet,

package/dist/lib.esm/vue/wagmi/constants.js

@@ -0,0 +1,14 @@
+import { createConfig, http } from '@wagmi/vue';
+import { mainnet } from '@wagmi/vue/chains';
+
+const defaultWagmiConfig = createConfig({
+  chains: [mainnet],
+  connectors: [],
+  // or your basic wallets
+  ssr: true,
+  transports: {
+    [mainnet.id]: http(mainnet.rpcUrls.default.http[0])
+  }
+});
+
+export { defaultWagmiConfig };

package/dist/lib.esm/vue/wagmi/provider.js

@@ -1,12 +1,16 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { hydrate } from '@wagmi/core';
-import { configKey, createConfig, useConfig, useAccountEffect } from '@wagmi/vue';
+import { configKey, createConfig, useConfig, useReconnect, useAccountEffect } from '@wagmi/vue';
 import { injected } from '@wagmi/vue/connectors';
+import { randomId } from '@web3auth/auth';
 import { defineChain, webSocket, http } from 'viem';
-import { defineComponent, h, shallowRef, watch, provide } from 'vue';
+import { defineComponent, h, shallowRef, ref, watch, provide } from 'vue';
 import { log } from '../../base/loglevel.js';
+import { defaultWagmiConfig } from './constants.js';
 import { useWeb3AuthDisconnect } from '../composables/useWeb3AuthDisconnect.js';
 import { useWeb3Auth } from '../composables/useWeb3Auth.js';
+import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { WalletInitializationError } from '../../base/errors/index.js';
 
 const WEB3AUTH_CONNECTOR_ID = "web3auth";
 
@@ -70,6 +74,9 @@ const Web3AuthWagmiProvider = defineComponent({
       disconnect
     } = useWeb3AuthDisconnect();
     const wagmiConfig = useConfig();
+    const {
+      reconnect
+    } = useReconnect();
     useAccountEffect({
       onDisconnect: async () => {
         log.info("Disconnected from wagmi");
@@ -83,6 +90,7 @@ const Web3AuthWagmiProvider = defineComponent({
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        reconnect();
       } else if (!newIsConnected) {
         if (wagmiConfig.state.status === "connected") {
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
@@ -132,7 +140,8 @@ const WagmiProvider = defineComponent({
       web3Auth,
       isInitialized
     } = useWeb3Auth();
-    const finalConfig = shallowRef(null);
+    const finalConfig = shallowRef(defaultWagmiConfig);
+    const configKey = ref(randomId());
     const defineWagmiConfig = () => {
       var _web3Auth$value;
       const configParams = _objectSpread(_objectSpread({
@@ -148,7 +157,8 @@ const WagmiProvider = defineComponent({
       if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.coreOptions) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chains) {
         var _web3Auth$value$curre;
         const defaultChainId = (_web3Auth$value$curre = web3Auth.value.currentChain) === null || _web3Auth$value$curre === void 0 ? void 0 : _web3Auth$value$curre.chainId;
-        const chains = web3Auth.value.coreOptions.chains;
+        const chains = web3Auth.value.coreOptions.chains.filter(chain => chain.chainNamespace === CHAIN_NAMESPACES.EIP155);
+        if (chains.length === 0) throw WalletInitializationError.invalidParams("No valid chains found in web3auth config for wagmi.");
         chains.forEach(chain => {
           const wagmiChain = defineChain({
             id: Number.parseInt(chain.chainId, 16),
@@ -182,29 +192,39 @@ const WagmiProvider = defineComponent({
         });
         configParams.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
       }
-      if (!configParams.chains) return;
       return createConfig(configParams);
     };
+    const hydrateWagmiConfig = () => {
+      if (finalConfig.value) {
+        hydrate(finalConfig.value, _objectSpread({
+          reconnectOnMount: false
+        }, props.config));
+      }
+    };
     watch(isInitialized, newIsInitialized => {
       if (newIsInitialized && !finalConfig.value) {
         finalConfig.value = defineWagmiConfig();
-        if (finalConfig.value) {
-          hydrate(finalConfig.value, _objectSpread({
-            reconnectOnMount: false
-          }, props.config));
-        }
+        hydrateWagmiConfig();
+        configKey.value = randomId();
       }
     }, {
       immediate: true
     });
+    if (!isInitialized.value) {
+      hydrateWagmiConfig();
+    }
     return {
-      finalConfig
+      finalConfig,
+      configKey
     };
   },
   render() {
     if (!this.finalConfig) return null;
-    return h(Web3AuthWagmiInnerProvider, {
-      config: this.finalConfig
+    return h(Web3AuthWagmiInnerProvider,
+    // This key is used to remount the provider when the config changes.
+    {
+      config: this.finalConfig,
+      key: this.configKey
     }, {
       default: () => {
         var _this$$slots$default3, _this$$slots;