Merge branch 'feat/privy-polishup' into dev

frak-id · Jan 3, 2025 · 5ef28d5 · 5ef28d5
2 parents 1b9b357 + 0c945f8
commit 5ef28d5
Show file tree

Hide file tree

Showing 35 changed files with 622 additions and 176 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/example/news-interactions/sst-env.d.ts b/example/news-interactions/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/example/vanilla-js/sst-env.d.ts b/example/vanilla-js/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/example/wallet-ethcc/sst-env.d.ts b/example/wallet-ethcc/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/infra/config.ts b/infra/config.ts
@@ -63,6 +63,7 @@ export const vapidPublicKey = new sst.Secret("VAPID_PUBLIC_KEY");
 export const umamiWalletWebsiteId = new sst.Secret("UMAMI_WALLET_WEBSITE_ID");
 export const sessionEncryptionKy = new sst.Secret("SESSION_ENCRYPTION_KEY");
 export const mongoBusinessDb = new sst.Secret("MONGODB_BUSINESS_URI");
+export const privyAppId = new sst.Secret("PRIVY_APP_ID");
 
 export const postgresHost = new sst.Secret("POSTGRES_HOST");
 export const postgresPassword = new sst.Secret("POSTGRES_PASSWORD");
diff --git a/infra/wallet.ts b/infra/wallet.ts
@@ -5,6 +5,7 @@ import {
     isProd,
     nexusRpcSecret,
     pimlicoApiKey,
+    privyAppId,
     umamiWalletWebsiteId,
     vapidPublicKey,
 } from "./config";
@@ -37,5 +38,6 @@ new sst.aws.StaticSite("Wallet", {
         NEXUS_RPC_SECRET: nexusRpcSecret.value,
         VAPID_PUBLIC_KEY: vapidPublicKey.value,
         UMAMI_WALLET_WEBSITE_ID: umamiWalletWebsiteId.value,
+        PRIVY_APP_ID: privyAppId.value,
     },
 });
diff --git a/packages/app-essentials/sst-env.d.ts b/packages/app-essentials/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/packages/backend-elysia/sst-env.d.ts b/packages/backend-elysia/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/packages/dashboard/sst-env.d.ts b/packages/dashboard/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/packages/shared/sst-env.d.ts b/packages/shared/sst-env.d.ts
@@ -50,6 +50,10 @@ declare module "sst" {
       "type": "sst.sst.Secret"
       "value": string
     }
+    "PRIVY_APP_ID": {
+      "type": "sst.sst.Secret"
+      "value": string
+    }
     "SESSION_ENCRYPTION_KEY": {
       "type": "sst.sst.Secret"
       "value": string

diff --git a/packages/wallet/app/context/blockchain/privy-cross-client.ts b/packages/wallet/app/context/blockchain/privy-cross-client.ts
diff --git a/packages/wallet/app/context/blockchain/privy.ts b/packages/wallet/app/context/blockchain/privy.ts
@@ -0,0 +1 @@
+export const isPrivyEnabled = false;
diff --git a/packages/wallet/app/context/wallet/smartWallet/connector.ts b/packages/wallet/app/context/wallet/smartWallet/connector.ts
@@ -1,8 +1,7 @@
-import { crossAppClient } from "@/context/blockchain/privy-cross-client";
 import { currentChain } from "@/context/blockchain/provider";
 import { getSmartAccountProvider } from "@/context/wallet/smartWallet/provider";
 import type { SmartAccountV06 } from "@/context/wallet/smartWallet/utils";
-import { type Hex, type Transport, isAddressEqual } from "viem";
+import type { Address, Hex, Transport } from "viem";
 import { createConnector } from "wagmi";
 
 smartAccountConnector.type = "frakSmartAccountConnector" as const;
@@ -26,8 +25,18 @@ export function smartAccountConnector<
     // The current provider
     let provider: Provider | undefined;
 
+    // The current privy signer
+    let privySigner:
+        | ((args: { hash: Hex; address: Address }) => Promise<Hex>)
+        | undefined = undefined;
+
     // Create the wagmi connector itself
-    return createConnector<Provider>((config) => ({
+    return createConnector<
+        Provider,
+        {
+            setPrivySigner: (signer: typeof privySigner) => void;
+        }
+    >((config) => ({
         id: "frak-wallet-connector",
         name: "Frak Smart Account",
         type: smartAccountConnector.type,
@@ -145,22 +154,11 @@ export function smartAccountConnector<
                     },
 
                     async signViaEcdsa(message, address) {
-                        const currentWallet = crossAppClient.address;
-                        if (
-                            !(
-                                currentWallet &&
-                                isAddressEqual(currentWallet, address)
-                            )
-                        ) {
-                            throw new Error("No current wallet");
+                        if (!privySigner) {
+                            throw new Error("No privy signer");
                         }
 
-                        // Send the request to the cross app client
-                        const response = await crossAppClient.sendRequest(
-                            "personal_sign",
-                            [message, currentWallet]
-                        );
-                        return response as Hex;
+                        return privySigner({ hash: message, address });
                     },
                 });
             }
@@ -175,5 +173,12 @@ export function smartAccountConnector<
         onDisconnect() {
             config.emitter.emit("disconnect");
         },
+        /**
+         * Update the current privy signer
+         * @param signer
+         */
+        setPrivySigner(signer: typeof privySigner) {
+            privySigner = signer;
+        },
     }));
 }
diff --git a/packages/wallet/app/module/authentication/component/EcdsaLogin/index.tsx b/packages/wallet/app/module/authentication/component/EcdsaLogin/index.tsx
@@ -1,4 +1,4 @@
-import { usePrivyCrossAppAuthenticate } from "@/module/common/hook/crossAppPrivyHooks";
+import { usePrivyLogin } from "@/module/authentication/hook/usePrivyLogin";
 import { Button } from "@module/component/Button";
 import { useTranslation } from "react-i18next";
 
@@ -9,11 +9,15 @@ import { useTranslation } from "react-i18next";
  * @constructor
  */
 export function EcdsaLogin() {
-    const { mutate: logIn } = usePrivyCrossAppAuthenticate();
+    const { privyLogin } = usePrivyLogin();
     const { t } = useTranslation();
 
     return (
-        <Button type={"button"} onClick={() => logIn()} variant={"primary"}>
+        <Button
+            type={"button"}
+            onClick={() => privyLogin()}
+            variant={"primary"}
+        >
             {t("wallet.login.privy")}
         </Button>
     );

diff --git a/packages/wallet/app/module/authentication/component/Logout/index.tsx b/packages/wallet/app/module/authentication/component/Logout/index.tsx
@@ -1,4 +1,3 @@
-import { crossAppClient } from "@/context/blockchain/privy-cross-client";
 import { sdkSessionAtom, sessionAtom } from "@/module/common/atoms/session";
 import { Panel } from "@/module/common/component/Panel";
 import { jotaiStore } from "@module/atoms/store";
@@ -30,6 +29,7 @@ export function Logout() {
     const { t } = useTranslation();
     const navigate = useNavigate();
     const queryClient = useQueryClient();
+    // const { logout: privyLogout } = usePrivyContext();
 
     return (
         <Panel size={"none"} variant={"invisible"}>
@@ -39,7 +39,8 @@ export function Logout() {
                 align={"left"}
                 onClick={async () => {
                     // Privy logout
-                    crossAppClient.clearConnection();
+                    // todo: to reput when privy enabled
+                    // await privyLogout();
                     // Session deletion
                     jotaiStore.set(sessionAtom, RESET);
                     jotaiStore.set(sdkSessionAtom, RESET);

diff --git a/.../module/common/hook/crossAppPrivyHooks.ts → ...dule/authentication/hook/usePrivyLogin.ts b/.../module/common/hook/crossAppPrivyHooks.ts → ...dule/authentication/hook/usePrivyLogin.ts
@@ -1,57 +1,34 @@
-import { crossAppClient } from "@/context/blockchain/privy-cross-client";
 import { authenticatedBackendApi } from "@/context/common/backendClient";
 import { sdkSessionAtom, sessionAtom } from "@/module/common/atoms/session";
+import { usePrivyContext } from "@/module/common/provider/PrivyProvider";
 import type { Session } from "@/types/Session";
 import { jotaiStore } from "@module/atoms/store";
 import { trackEvent } from "@module/utils/trackEvent";
-import {
-    type UseMutationOptions,
-    useMutation,
-    useQueryClient,
-} from "@tanstack/react-query";
-import { type Address, type Hex, stringToHex } from "viem";
+import { useMutation } from "@tanstack/react-query";
+import type { UseMutationOptions } from "@tanstack/react-query";
+import { type Address, stringToHex } from "viem";
 import { generatePrivateKey } from "viem/accounts";
 
-export const crossAppWalletQuery = {
-    queryKey: ["privy-cross-app", "wallet"],
-    queryFn() {
-        return crossAppClient.address;
-    },
-} as const;
-
-export const isCrossAppWalletLoggedInQuery = {
-    queryKey: ["privy-cross-app", "isLoggedIn"],
-    queryFn() {
-        return crossAppClient.address;
-    },
-} as const;
-
 /**
- * Function used to trigger a privy external authentication
+ * Hook that handle the registration process
  */
-export function usePrivyCrossAppAuthenticate(
-    opts?: Omit<
-        UseMutationOptions<Session, Error>,
-        "mutationFn" | "mutationKey"
-    >
-) {
-    const queryClient = useQueryClient();
-    return useMutation({
-        ...opts,
-        mutationKey: ["privy-cross-app", "authenticate"],
-        async mutationFn() {
-            let wallet = crossAppClient.address;
-            if (!wallet) {
-                // If we don't have a wallet, request a connection
-                await crossAppClient.requestConnection();
-                await queryClient.invalidateQueries({
-                    queryKey: ["privy-cross-app"],
-                    exact: false,
-                });
-                wallet = crossAppClient.address;
-            }
+export function usePrivyLogin(options?: UseMutationOptions<Session>) {
+    const { login, signMessage } = usePrivyContext();
 
-            // If we still don't have a wallet, throw an error
+    // The mutation that will be used to perform the privy login process
+    const {
+        isPending: isLoading,
+        isSuccess,
+        isError,
+        error,
+        mutate: privyLogin,
+        mutateAsync: privyLoginAsync,
+    } = useMutation({
+        ...options,
+        mutationKey: ["privy-login"],
+        mutationFn: async () => {
+            // Do the initial privy login stuff
+            const wallet = await login();
             if (!wallet) {
                 throw new Error("No wallet selected");
             }
@@ -62,11 +39,11 @@ export function usePrivyCrossAppAuthenticate(
             // Build the message to sign
             const message = `I want to connect to Frak and I accept the CGU.\n Verification code:${challenge}`;
 
-            // Launch the signature
-            const signature = (await crossAppClient.sendRequest(
-                "personal_sign",
-                [stringToHex(message), wallet]
-            )) as Hex | undefined;
+            // Sign the message
+            const signature = await signMessage({
+                hash: stringToHex(message),
+                address: wallet,
+            });
             if (!signature) {
                 console.warn("No signature");
                 throw new Error("No signature returned");
@@ -98,4 +75,13 @@ export function usePrivyCrossAppAuthenticate(
             return session;
         },
     });
+
+    return {
+        isLoading,
+        isSuccess,
+        isError,
+        error,
+        privyLogin,
+        privyLoginAsync,
+    };
 }