@zerodev/wallet-react 0.0.1-alpha.0 → 0.0.1-alpha.10

package/dist/_cjs/connector.js

@@ -6,51 +6,86 @@ const sdk_1 = require("@zerodev/sdk");
 const constants_1 = require("@zerodev/sdk/constants");
 const wallet_core_1 = require("@zerodev/wallet-core");
 const viem_1 = require("viem");
+const oauth_js_1 = require("./oauth.js");
 const provider_js_1 = require("./provider.js");
 const store_js_1 = require("./store.js");
 const aaUtils_js_1 = require("./utils/aaUtils.js");
+const OAUTH_SUCCESS_PARAM = 'oauth_success';
+const OAUTH_PROVIDER_PARAM = 'oauth_provider';
+async function detectAndHandleOAuthCallback(wallet, store) {
+    if (typeof window === 'undefined')
+        return false;
+    const params = new URLSearchParams(window.location.search);
+    const isOAuthCallback = params.get(OAUTH_SUCCESS_PARAM) === 'true';
+    if (!isOAuthCallback)
+        return false;
+    if (window.opener) {
+        (0, oauth_js_1.handleOAuthCallback)(OAUTH_SUCCESS_PARAM);
+        return true;
+    }
+    console.log('OAuth callback detected, completing authentication...');
+    const provider = (params.get(OAUTH_PROVIDER_PARAM) ||
+        'google');
+    try {
+        await wallet.auth({ type: 'oauth', provider });
+        const [session, eoaAccount] = await Promise.all([
+            wallet.getSession(),
+            wallet.toAccount(),
+        ]);
+        store.getState().setEoaAccount(eoaAccount);
+        store.getState().setSession(session || null);
+        params.delete(OAUTH_SUCCESS_PARAM);
+        params.delete(OAUTH_PROVIDER_PARAM);
+        const newUrl = params.toString()
+            ? `${window.location.pathname}?${params.toString()}`
+            : window.location.pathname;
+        window.history.replaceState({}, '', newUrl);
+        console.log('OAuth authentication completed');
+        return true;
+    }
+    catch (error) {
+        console.error('OAuth authentication failed:', error);
+        return false;
+    }
+}
 function zeroDevWallet(params) {
     return (0, core_1.createConnector)((wagmiConfig) => {
         let store;
         let provider;
-        let initPromise;
         const transports = wagmiConfig.transports;
         const initialize = async () => {
-            initPromise ??= (async () => {
-                console.log('Initializing ZeroDevWallet connector...');
-                const wallet = await (0, wallet_core_1.createZeroDevWallet)({
-                    projectId: params.projectId,
-                    ...(params.organizationId && {
-                        organizationId: params.organizationId,
-                    }),
-                    ...(params.proxyBaseUrl && { proxyBaseUrl: params.proxyBaseUrl }),
-                    ...(params.sessionStorage && {
-                        sessionStorage: params.sessionStorage,
-                    }),
-                    ...(params.rpId && { rpId: params.rpId }),
-                });
-                store = (0, store_js_1.createZeroDevWalletStore)();
-                store.getState().setWallet(wallet);
-                const chainIds = params.chains.map((c) => c.id);
-                store.setState({ chainIds });
-                if (params.oauthConfig) {
-                    store.getState().setOAuthConfig(params.oauthConfig);
-                }
-                provider = (0, provider_js_1.createProvider)({
-                    store,
-                    config: params,
-                    chains: Array.from(params.chains),
-                });
-                const session = await wallet.getSession();
-                if (session) {
-                    console.log('Found existing session, restoring...');
-                    const eoaAccount = await wallet.toAccount();
-                    store.getState().setEoaAccount(eoaAccount);
-                    store.getState().setSession(session);
-                }
-                console.log('ZeroDevWallet connector initialized');
-            })();
-            return initPromise;
+            console.log('Initializing ZeroDevWallet connector...');
+            const wallet = await (0, wallet_core_1.createZeroDevWallet)({
+                projectId: params.projectId,
+                ...(params.organizationId && {
+                    organizationId: params.organizationId,
+                }),
+                ...(params.proxyBaseUrl && { proxyBaseUrl: params.proxyBaseUrl }),
+                ...(params.sessionStorage && {
+                    sessionStorage: params.sessionStorage,
+                }),
+                ...(params.rpId && { rpId: params.rpId }),
+            });
+            store = (0, store_js_1.createZeroDevWalletStore)();
+            store.getState().setWallet(wallet);
+            store.getState().setOAuthConfig({
+                backendUrl: params.proxyBaseUrl || `${wallet_core_1.KMS_SERVER_URL}/api/v1`,
+                projectId: params.projectId,
+            });
+            provider = (0, provider_js_1.createProvider)({
+                store,
+                config: params,
+                chains: Array.from(params.chains),
+            });
+            const session = await wallet.getSession();
+            if (session) {
+                console.log('Found existing session, restoring...');
+                const eoaAccount = await wallet.toAccount();
+                store.getState().setEoaAccount(eoaAccount);
+                store.getState().setSession(session);
+            }
+            await detectAndHandleOAuthCallback(wallet, store);
+            console.log('ZeroDevWallet connector initialized');
         };
         return {
             id: 'zerodev-wallet',
@@ -69,10 +104,7 @@ function zeroDevWallet(params) {
                     ? 'Reconnecting ZeroDevWallet...'
                     : 'Connecting ZeroDevWallet...');
                 const state = store.getState();
-                const activeChainId = chainId || state.chainIds[0];
-                if (!activeChainId) {
-                    throw new Error('No chain configured');
-                }
+                const activeChainId = chainId ?? state.activeChainId ?? params.chains[0].id;
                 if (isReconnecting && state.kernelAccounts.has(activeChainId)) {
                     const kernelAccount = state.kernelAccounts.get(activeChainId);
                     if (kernelAccount?.address) {
@@ -105,17 +137,17 @@ function zeroDevWallet(params) {
                     store.getState().setKernelAccount(activeChainId, kernelAccount);
                     const kernelClient = (0, sdk_1.createKernelAccountClient)({
                         account: kernelAccount,
-                        bundlerTransport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(activeChainId, params.aaUrl)),
+                        bundlerTransport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(params.projectId, activeChainId, params.aaUrl)),
                         chain,
                         client: publicClient,
                         paymaster: (0, sdk_1.createZeroDevPaymasterClient)({
                             chain,
-                            transport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(activeChainId, params.aaUrl)),
+                            transport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(params.projectId, activeChainId, params.aaUrl)),
                         }),
                     });
                     store.getState().setKernelClient(activeChainId, kernelClient);
                 }
-                store.getState().setActiveChain(activeChainId);
+                store.getState().setActiveChainId(activeChainId);
                 const freshState = store.getState();
                 const kernelAccount = freshState.kernelAccounts.get(activeChainId);
                 console.log('ZeroDevWallet connected:', kernelAccount.address);
@@ -139,32 +171,33 @@ function zeroDevWallet(params) {
             async getAccounts() {
                 if (!store)
                     return [];
-                const { eoaAccount, kernelAccounts, chainIds } = store.getState();
+                const { eoaAccount, kernelAccounts, activeChainId } = store.getState();
                 if (eoaAccount) {
                     return [eoaAccount.address];
                 }
-                const activeAccount = chainIds[0]
-                    ? kernelAccounts.get(chainIds[0])
+                const activeAccount = activeChainId
+                    ? kernelAccounts.get(activeChainId)
                     : null;
                 return activeAccount ? [activeAccount.address] : [];
             },
             async getChainId() {
                 if (!store)
                     return params.chains[0].id;
-                return store.getState().chainIds[0] || params.chains[0].id;
+                return store.getState().activeChainId ?? params.chains[0].id;
             },
             async getProvider() {
-                await initialize();
+                if (!provider) {
+                    await initialize();
+                }
                 return provider;
             },
             async switchChain({ chainId }) {
-                await initialize();
                 console.log(`Switching to chain ${chainId}...`);
                 const state = store.getState();
                 if (!state.eoaAccount) {
                     throw new Error('Not authenticated');
                 }
-                store.getState().setActiveChain(chainId);
+                store.getState().setActiveChainId(chainId);
                 if (!state.kernelAccounts.has(chainId)) {
                     const chain = params.chains.find((c) => c.id === chainId);
                     if (!chain) {
@@ -184,16 +217,17 @@ function zeroDevWallet(params) {
                     store.getState().setKernelAccount(chainId, kernelAccount);
                     const kernelClient = (0, sdk_1.createKernelAccountClient)({
                         account: kernelAccount,
-                        bundlerTransport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(chainId, params.aaUrl)),
+                        bundlerTransport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(params.projectId, chainId, params.aaUrl)),
                         chain,
                         client: publicClient,
                         paymaster: (0, sdk_1.createZeroDevPaymasterClient)({
                             chain,
-                            transport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(chainId, params.aaUrl)),
+                            transport: (0, viem_1.http)((0, aaUtils_js_1.getAAUrl)(params.projectId, chainId, params.aaUrl)),
                         }),
                     });
                     store.getState().setKernelClient(chainId, kernelClient);
                 }
+                wagmiConfig.emitter.emit('change', { chainId });
                 return params.chains.find((c) => c.id === chainId);
             },
             async isAuthorized() {

package/dist/_cjs/constants.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZERODEV_AA_URL = void 0;
-exports.ZERODEV_AA_URL = 'https://rpc.zerodev.app/api/v3/';
+exports.ZERODEV_AA_URL = 'https://staging-meta-aa-provider.onrender.com/api/v3/';

package/dist/_cjs/hooks/useExportPrivateKey.js

@@ -0,0 +1,18 @@
+"use strict";
+'use client';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useExportPrivateKey = useExportPrivateKey;
+const react_query_1 = require("@tanstack/react-query");
+const wagmi_1 = require("wagmi");
+const actions_js_1 = require("../actions.js");
+function useExportPrivateKey(parameters = {}) {
+    const { mutation } = parameters;
+    const config = (0, wagmi_1.useConfig)(parameters);
+    return (0, react_query_1.useMutation)({
+        ...mutation,
+        async mutationFn(variables) {
+            return (0, actions_js_1.exportPrivateKey)(config, variables);
+        },
+        mutationKey: ['exportPrivateKey'],
+    });
+}

package/dist/_cjs/hooks/useGetUserEmail.js

@@ -0,0 +1,19 @@
+"use strict";
+'use client';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useGetUserEmail = useGetUserEmail;
+const react_query_1 = require("@tanstack/react-query");
+const wagmi_1 = require("wagmi");
+const actions_js_1 = require("../actions.js");
+function useGetUserEmail(parameters) {
+    const { query } = parameters;
+    const config = (0, wagmi_1.useConfig)(parameters);
+    return (0, react_query_1.useQuery)({
+        ...query,
+        queryKey: ['getUserEmail'],
+        queryFn: async () => {
+            return (0, actions_js_1.getUserEmail)(config);
+        },
+        enabled: Boolean(config),
+    });
+}

package/dist/_cjs/index.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createZeroDevWalletStore = exports.OAUTH_PROVIDERS = exports.useVerifyOTP = exports.useSendOTP = exports.useRegisterPasskey = exports.useRefreshSession = exports.useLoginPasskey = exports.useExportWallet = exports.useAuthenticateOAuth = exports.zeroDevWallet = void 0;
+exports.createZeroDevWalletStore = exports.OAUTH_PROVIDERS = exports.listenForOAuthMessage = exports.handleOAuthCallback = exports.buildBackendOAuthUrl = exports.useVerifyOTP = exports.useSendOTP = exports.useRegisterPasskey = exports.useRefreshSession = exports.useLoginPasskey = exports.useGetUserEmail = exports.useExportWallet = exports.useExportPrivateKey = exports.useAuthenticateOAuth = exports.zeroDevWallet = void 0;
 var connector_js_1 = require("./connector.js");
 Object.defineProperty(exports, "zeroDevWallet", { enumerable: true, get: function () { return connector_js_1.zeroDevWallet; } });
 var useAuthenticateOAuth_js_1 = require("./hooks/useAuthenticateOAuth.js");
 Object.defineProperty(exports, "useAuthenticateOAuth", { enumerable: true, get: function () { return useAuthenticateOAuth_js_1.useAuthenticateOAuth; } });
+var useExportPrivateKey_js_1 = require("./hooks/useExportPrivateKey.js");
+Object.defineProperty(exports, "useExportPrivateKey", { enumerable: true, get: function () { return useExportPrivateKey_js_1.useExportPrivateKey; } });
 var useExportWallet_js_1 = require("./hooks/useExportWallet.js");
 Object.defineProperty(exports, "useExportWallet", { enumerable: true, get: function () { return useExportWallet_js_1.useExportWallet; } });
+var useGetUserEmail_js_1 = require("./hooks/useGetUserEmail.js");
+Object.defineProperty(exports, "useGetUserEmail", { enumerable: true, get: function () { return useGetUserEmail_js_1.useGetUserEmail; } });
 var useLoginPasskey_js_1 = require("./hooks/useLoginPasskey.js");
 Object.defineProperty(exports, "useLoginPasskey", { enumerable: true, get: function () { return useLoginPasskey_js_1.useLoginPasskey; } });
 var useRefreshSession_js_1 = require("./hooks/useRefreshSession.js");
@@ -18,6 +22,9 @@ Object.defineProperty(exports, "useSendOTP", { enumerable: true, get: function (
 var useVerifyOTP_js_1 = require("./hooks/useVerifyOTP.js");
 Object.defineProperty(exports, "useVerifyOTP", { enumerable: true, get: function () { return useVerifyOTP_js_1.useVerifyOTP; } });
 var oauth_js_1 = require("./oauth.js");
+Object.defineProperty(exports, "buildBackendOAuthUrl", { enumerable: true, get: function () { return oauth_js_1.buildBackendOAuthUrl; } });
+Object.defineProperty(exports, "handleOAuthCallback", { enumerable: true, get: function () { return oauth_js_1.handleOAuthCallback; } });
+Object.defineProperty(exports, "listenForOAuthMessage", { enumerable: true, get: function () { return oauth_js_1.listenForOAuthMessage; } });
 Object.defineProperty(exports, "OAUTH_PROVIDERS", { enumerable: true, get: function () { return oauth_js_1.OAUTH_PROVIDERS; } });
 var store_js_1 = require("./store.js");
 Object.defineProperty(exports, "createZeroDevWalletStore", { enumerable: true, get: function () { return store_js_1.createZeroDevWalletStore; } });

package/dist/_cjs/oauth.js

@@ -1,42 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAUTH_PROVIDERS = void 0;
-exports.buildOAuthUrl = buildOAuthUrl;
 exports.openOAuthPopup = openOAuthPopup;
-exports.extractOAuthToken = extractOAuthToken;
-exports.pollOAuthPopup = pollOAuthPopup;
 exports.generateOAuthNonce = generateOAuthNonce;
+exports.buildBackendOAuthUrl = buildBackendOAuthUrl;
+exports.listenForOAuthMessage = listenForOAuthMessage;
+exports.handleOAuthCallback = handleOAuthCallback;
 const viem_1 = require("viem");
 exports.OAUTH_PROVIDERS = {
     GOOGLE: 'google',
 };
-const GOOGLE_AUTH_URL = 'https://accounts.google.com/o/oauth2/v2/auth';
 const POPUP_WIDTH = 500;
 const POPUP_HEIGHT = 600;
-function buildOAuthUrl(params) {
-    const { provider, clientId, redirectUri, nonce, state } = params;
-    if (provider !== exports.OAUTH_PROVIDERS.GOOGLE) {
-        throw new Error(`Unsupported OAuth provider: ${provider}`);
-    }
-    const authUrl = new URL(GOOGLE_AUTH_URL);
-    authUrl.searchParams.set('client_id', clientId);
-    authUrl.searchParams.set('redirect_uri', redirectUri);
-    authUrl.searchParams.set('response_type', 'id_token');
-    authUrl.searchParams.set('scope', 'openid email profile');
-    authUrl.searchParams.set('nonce', nonce);
-    authUrl.searchParams.set('prompt', 'select_account');
-    let stateParam = `provider=${provider}`;
-    if (state) {
-        const additionalState = Object.entries(state)
-            .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
-            .join('&');
-        if (additionalState) {
-            stateParam += `&${additionalState}`;
-        }
-    }
-    authUrl.searchParams.set('state', stateParam);
-    return authUrl.toString();
-}
 function openOAuthPopup(url) {
     const width = POPUP_WIDTH;
     const height = POPUP_HEIGHT;
@@ -48,37 +23,67 @@ function openOAuthPopup(url) {
     }
     return authWindow;
 }
-function extractOAuthToken(url) {
-    const hashParams = new URLSearchParams(url.split('#')[1]);
-    let idToken = hashParams.get('id_token');
-    if (!idToken) {
-        const queryParams = new URLSearchParams(url.split('?')[1]);
-        idToken = queryParams.get('id_token');
+function generateOAuthNonce(publicKey) {
+    return (0, viem_1.sha256)(publicKey).replace(/^0x/, '');
+}
+function buildBackendOAuthUrl(params) {
+    const { provider, backendUrl, projectId, publicKey, returnTo } = params;
+    if (provider !== exports.OAUTH_PROVIDERS.GOOGLE) {
+        throw new Error(`Unsupported OAuth provider: ${provider}`);
     }
-    return idToken;
+    const oauthUrl = new URL(`${backendUrl}/oauth/google/login`);
+    oauthUrl.searchParams.set('project_id', projectId);
+    oauthUrl.searchParams.set('pub_key', publicKey.replace(/^0x/, ''));
+    oauthUrl.searchParams.set('return_to', returnTo);
+    return oauthUrl.toString();
 }
-function pollOAuthPopup(authWindow, originUrl, onSuccess, onError) {
-    const interval = setInterval(() => {
-        try {
-            if (authWindow.closed) {
-                clearInterval(interval);
-                onError(new Error('Authentication window was closed'));
-                return;
-            }
-            const url = authWindow.location.href || '';
-            if (url.startsWith(originUrl)) {
-                const token = extractOAuthToken(url);
-                if (token) {
-                    authWindow.close();
-                    clearInterval(interval);
-                    onSuccess(token);
-                }
-            }
+function listenForOAuthMessage(authWindow, expectedOrigin, onSuccess, onError) {
+    let cleaned = false;
+    const handleMessage = (event) => {
+        if (event.origin !== expectedOrigin)
+            return;
+        if (!event.data || typeof event.data !== 'object')
+            return;
+        if (event.data.type === 'oauth_success') {
+            cleanup();
+            onSuccess();
         }
-        catch {
+        else if (event.data.type === 'oauth_error') {
+            cleanup();
+            onError(new Error(event.data.error || 'OAuth authentication failed'));
+        }
+    };
+    const checkWindowClosed = setInterval(() => {
+        if (authWindow.closed) {
+            cleanup();
+            onError(new Error('Authentication window was closed'));
         }
     }, 500);
+    const cleanup = () => {
+        if (cleaned)
+            return;
+        cleaned = true;
+        window.removeEventListener('message', handleMessage);
+        clearInterval(checkWindowClosed);
+    };
+    window.addEventListener('message', handleMessage);
+    return cleanup;
 }
-function generateOAuthNonce(publicKey) {
-    return (0, viem_1.sha256)(publicKey).replace(/^0x/, '');
+function handleOAuthCallback(successParam = 'oauth_success') {
+    const urlParams = new URLSearchParams(window.location.search);
+    const isSuccess = urlParams.get(successParam) === 'true';
+    const error = urlParams.get('error');
+    if (window.opener) {
+        if (isSuccess) {
+            window.opener.postMessage({ type: 'oauth_success' }, window.location.origin);
+            window.close();
+            return true;
+        }
+        if (error) {
+            window.opener.postMessage({ type: 'oauth_error', error }, window.location.origin);
+            window.close();
+            return false;
+        }
+    }
+    return false;
 }

package/dist/_cjs/provider.js

@@ -77,7 +77,10 @@ function createProvider({ store, config, }) {
         },
         async request({ method, params }) {
             const state = store.getState();
-            const activeChainId = state.chainIds[0];
+            const activeChainId = state.activeChainId;
+            if (!activeChainId) {
+                throw new Error('No active chain');
+            }
             switch (method) {
                 case 'eth_accounts': {
                     const account = state.kernelAccounts.get(activeChainId);
@@ -151,7 +154,7 @@ function createProvider({ store, config, }) {
                     }
                     const [{ chainId }] = params;
                     const chainId_number = parseInt(chainId, 16);
-                    store.getState().setActiveChain(chainId_number);
+                    store.getState().setActiveChainId(chainId_number);
                     emitter.emit('chainChanged', chainId);
                     return null;
                 }

package/dist/_cjs/store.js

@@ -7,7 +7,7 @@ const createZeroDevWalletStore = () => (0, zustand_1.create)()((0, middleware_1.
     wallet: null,
     eoaAccount: null,
     session: null,
-    chainIds: [],
+    activeChainId: null,
     kernelAccounts: new Map(),
     kernelClients: new Map(),
     isExpiring: false,
@@ -25,12 +25,7 @@ const createZeroDevWalletStore = () => (0, zustand_1.create)()((0, middleware_1.
         set({ kernelClients: clients });
     },
     setSession: (session) => set({ session }),
-    setActiveChain: (chainId) => {
-        const { chainIds } = get();
-        set({
-            chainIds: [chainId, ...chainIds.filter((id) => id !== chainId)],
-        });
-    },
+    setActiveChainId: (chainId) => set({ activeChainId: chainId }),
     setIsExpiring: (isExpiring) => set({ isExpiring }),
     setOAuthConfig: (config) => set({ oauthConfig: config }),
     clear: () => set({
@@ -39,13 +34,13 @@ const createZeroDevWalletStore = () => (0, zustand_1.create)()((0, middleware_1.
         kernelAccounts: new Map(),
         kernelClients: new Map(),
         isExpiring: false,
-        chainIds: [],
+        activeChainId: null,
     }),
 }), {
     name: 'zerodev-wallet',
     partialize: (state) => ({
         session: state.session,
-        chainIds: state.chainIds,
+        activeChainId: state.activeChainId,
     }),
 })));
 exports.createZeroDevWalletStore = createZeroDevWalletStore;

package/dist/_cjs/utils/aaUtils.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAAUrl = getAAUrl;
 const constants_js_1 = require("../constants.js");
-function getAAUrl(chainId, aaUrl) {
-    return aaUrl || `${constants_js_1.ZERODEV_AA_URL}${chainId}/chain/${chainId}`;
+function getAAUrl(projectId, chainId, aaUrl) {
+    return aaUrl || `${constants_js_1.ZERODEV_AA_URL}${projectId}/chain/${chainId}`;
 }