prep and clean up for sendtag checkout (#602)

* fix sign-in.anon.spec * clean up useProfileLookup and tsconfigs * add playwright record option * only wait 10 seconds for send account create request * app: estimate call gas limit
0xsend · Jul 17, 2024 · 411cc52 · 411cc52
1 parent 44ef187
commit 411cc52
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 45 deletions.
diff --git a/.env.local.template b/.env.local.template
@@ -20,3 +20,5 @@ SUPABASE_SERVICE_ROLE=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZ
 # NEXT_PUBLIC_ENABLE_QUERY_DEV_TOOLS=1
 # Enables more logging for sendapp
 # DEBUG="api:*,app:*,test:*,-test:fixtures:snaplet:*"
+# Record your playwright tests
+# PLAYWRIGHT_RECORD=1
diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
@@ -18,7 +18,8 @@
     "jest.setup-after-env.ts",
     "__mocks__",
     "tamagui.config.ts",
-    "./.eslintrc.cjs"
+    "./.eslintrc.cjs",
+    "../../supabase"
   ],
   "exclude": ["coverage"],
   "compilerOptions": {
@@ -32,6 +33,8 @@
       "@my/wagmi": ["../wagmi/src"],
       "@my/wagmi/*": ["../wagmi/src/*"],
       "@my/contracts/out/*": ["../contracts/out/*"],
+      "@my/supabase": ["../../supabase"],
+      "@my/supabase/*": ["../../supabase/*"],
       "@daimo/expo-passkeys/*": ["../daimo-expo-passkeys/src/*"]
     }
   },

diff --git a/packages/app/utils/useProfileLookup.ts b/packages/app/utils/useProfileLookup.ts
@@ -1,22 +1,40 @@
-import { type UseQueryResult, useQuery } from '@tanstack/react-query'
+import { type UseQueryResult, queryOptions, useQuery } from '@tanstack/react-query'
 import { useSupabase } from './supabase/useSupabase'
 import type { Functions, Database } from '@my/supabase/database.types'
-import type { PostgrestError } from '@supabase/supabase-js'
+import type { SupabaseClient } from '@supabase/supabase-js'
 import { assert } from './assert'
 
-export function useProfileLookup(
-  lookup_type: Database['public']['Enums']['lookup_type_enum'],
+export function fetchProfile({
+  supabase,
+  lookup_type,
+  identifier,
+}: {
+  supabase: SupabaseClient<Database>
+  lookup_type: Database['public']['Enums']['lookup_type_enum']
   identifier: string
-): UseQueryResult<Functions<'profile_lookup'>[number], PostgrestError> {
-  const supabase = useSupabase()
-  return useQuery({
-    queryKey: ['profile', lookup_type, identifier],
-    queryFn: async () => {
+}) {
+  return supabase.rpc('profile_lookup', { lookup_type: lookup_type, identifier: identifier })
+}
+
+export function profileLookupQueryOptions({
+  supabase,
+  lookup_type,
+  identifier,
+}: {
+  supabase: SupabaseClient<Database>
+  lookup_type: Database['public']['Enums']['lookup_type_enum'] | undefined
+  identifier: string | undefined
+}) {
+  return queryOptions({
+    queryKey: ['profile', { lookup_type, identifier, supabase }] as const,
+    queryFn: async ({ queryKey: [, { supabase, lookup_type, identifier }] }) => {
       assert(!!lookup_type, 'lookup_type is required')
       assert(!!identifier, 'identifier is required')
-      const { data, error } = await supabase
-        .rpc('profile_lookup', { lookup_type: lookup_type, identifier: identifier })
-        .maybeSingle()
+      const { data, error } = await fetchProfile({
+        supabase,
+        lookup_type,
+        identifier,
+      }).maybeSingle()
       if (error) {
         if (error.code === 'PGRST116') {
           // no rows found
@@ -29,3 +47,11 @@ export function useProfileLookup(
     enabled: !!lookup_type && !!identifier,
   })
 }
+
+export function useProfileLookup(
+  lookup_type: Database['public']['Enums']['lookup_type_enum'],
+  identifier: string
+): UseQueryResult<Functions<'profile_lookup'>[number] | null, Error> {
+  const supabase = useSupabase()
+  return useQuery(profileLookupQueryOptions({ supabase, lookup_type, identifier }))
+}
diff --git a/packages/app/utils/userop.ts b/packages/app/utils/userop.ts
@@ -1,5 +1,6 @@
 import { signWithPasskey } from '@daimo/expo-passkeys'
 import {
+  baseMainnetBundlerClient,
   entryPointAddress,
   sendAccountAbi,
   sendTokenAbi,
@@ -279,6 +280,7 @@ function userOpQueryOptions({
         functionName: 'executeBatch',
         args: [calls],
       })
+
       const paymaster = tokenPaymasterAddress[chainId]
       const userOp: UserOperation<'v0.7'> = {
         ...defaultUserOp,
@@ -291,7 +293,13 @@ function userOpQueryOptions({
         paymasterData: '0x',
         signature: '0x',
       }
-      return userOp
+
+      // only estimate the gas for the call
+      const { callGasLimit } = await baseMainnetBundlerClient.estimateUserOperationGas({
+        userOperation: userOp,
+      })
+
+      return { ...userOp, callGasLimit }
     },
   })
 }

diff --git a/packages/playwright/playwright.config.ts b/packages/playwright/playwright.config.ts
@@ -50,10 +50,14 @@ export default defineConfig({
     trace: 'on-first-retry',
 
     /* Configure the video recording. */
-    // video: {
-    //   size: { width: 1366, height: 768 },
-    //   mode: 'on',
-    // },
+    ...(process.env.PLAYWRIGHT_RECORD
+      ? {
+          video: {
+            size: { width: 1366, height: 768 },
+            mode: 'on',
+          },
+        }
+      : undefined),
   },
 
   /* Configure projects for major browsers */

diff --git a/packages/playwright/tests/fixtures/send-accounts/page.ts b/packages/playwright/tests/fixtures/send-accounts/page.ts
@@ -29,19 +29,22 @@ export class OnboardingPage {
       }
       return false
     })
-    const response = this.page.waitForEvent('response', async (response) => {
-      if (response.url().includes('/api/trpc/sendAccount.create')) {
-        const json = await response.json()
-        expect(json.data?.[0]?.error).toBeFalsy()
-        this.log?.(
-          'sendAccount.create response',
-          response.url(),
-          response.status(),
-          JSON.stringify(json)
-        )
-        return true
-      }
-      return false
+    const response = this.page.waitForEvent('response', {
+      predicate: async (response) => {
+        if (response.url().includes('/api/trpc/sendAccount.create')) {
+          const json = await response.json()
+          expect(json.data?.[0]?.error).toBeFalsy()
+          this.log?.(
+            'sendAccount.create response',
+            response.url(),
+            response.status(),
+            JSON.stringify(json)
+          )
+          return true
+        }
+        return false
+      },
+      timeout: 10_000,
     })
 
     await this.page.getByRole('button', { name: 'Create Passkey' }).click()

diff --git a/packages/playwright/tests/sign-in.anon.spec.ts b/packages/playwright/tests/sign-in.anon.spec.ts
@@ -27,8 +27,9 @@ test('redirect on sign-in', async ({ page, pg }) => {
     // ensure use can log in with passkey
     await page.context().clearCookies()
     await page.goto('/send')
+    await page.waitForURL(/auth\/sign-in/)
     // redirect to send after user is logged in
-    await expect(page).toHaveURL('/auth/sign-in?redirectUri=/send')
+    await expect(page).toHaveURL(`/auth/sign-in?redirectUri=${encodeURIComponent('/send')}`)
     const signInButton = page.getByRole('button', { name: 'Sign In' })
     await expect(signInButton).toBeVisible()
     await signInButton.click()
@@ -56,6 +57,7 @@ test('redirect to send confirm page on sign-in', async ({ page, seed, pg }) => {
 
   // naive but go to home page to see if user is logged in
   await page.goto('/auth/sign-up')
+  await page.waitForURL(/auth\/sign-up/)
   await expect(page).toHaveURL('/auth/sign-up')
 
   try {
@@ -66,6 +68,7 @@ test('redirect to send confirm page on sign-in', async ({ page, seed, pg }) => {
     await page.goto(
       `/send/confirm?idType=tag&recipient=${tag?.name}&amount=1&sendToken=${sendToken.address}`
     )
+    await page.waitForURL(/auth\/sign-in/)
     const beforeRedirectUrl = new URL(page.url())
     expect(Object.fromEntries(beforeRedirectUrl.searchParams.entries())).toMatchObject({
       redirectUri: `/send/confirm?idType=tag&recipient=${tag?.name}&amount=1&sendToken=${sendToken.address}`,
@@ -74,6 +77,7 @@ test('redirect to send confirm page on sign-in', async ({ page, seed, pg }) => {
     const signInButton = page.getByRole('button', { name: 'Sign In' })
     await expect(signInButton).toBeVisible()
     await signInButton.click()
+    await page.waitForURL(/send\/confirm/)
     //@todo: find a way to wait for the new url and check query params like above
     //       Checking the url strimg is not sturdy because it cares about the query params order
     await expect(page).toHaveURL(

diff --git a/packages/playwright/tsconfig.json b/packages/playwright/tsconfig.json
@@ -7,7 +7,8 @@
     "../app",
     "../wagmi",
     "../contracts",
-    "../webauthn-authenticator"
+    "../webauthn-authenticator",
+    "../../supabase"
   ],
   "compilerOptions": {
     "noEmit": true,
@@ -22,7 +23,9 @@
       "@my/playwright/*": ["./tests/*"],
       "@my/snaplet/*": ["../snaplet/src/*"],
       "@0xsend/webauthn-authenticator": ["../webauthn-authenticator/src"],
-      "@0xsend/webauthn-authenticator/*": ["../webauthn-authenticator/src/*"]
+      "@0xsend/webauthn-authenticator/*": ["../webauthn-authenticator/src/*"],
+      "@my/supabase": ["../../supabase"],
+      "@my/supabase/*": ["../../supabase/*"]
     }
   },
   "references": []

diff --git a/supabase/database.types.ts b/supabase/database.types.ts
@@ -7,11 +7,12 @@ import type { PostgrestError } from '@supabase/supabase-js'
  * @see https://www.postgresql.org/docs/16/functions-binarystring.html#ENCODE-FORMAT-HEX
  **/
 export type PgBytea = `\\x${string}`
+type Hex = `0x${string}`
 
 type ProfileLookupRow =
   DatabaseGenerated['public']['Functions']['profile_lookup']['Returns'][number]
 type ProfileLookup = {
-  [K in keyof ProfileLookupRow]: ProfileLookupRow[K] | null | undefined
+  [K in keyof ProfileLookupRow]: K extends 'address' ? Hex | null : ProfileLookupRow[K] | null
 }
 
 export type Database = MergeDeep<
@@ -21,24 +22,24 @@ export type Database = MergeDeep<
       Tables: {
         chain_addresses: {
           Row: {
-            address: `0x${string}`
+            address: Hex
           }
           Insert: {
-            address: `0x${string}`
+            address: Hex
           }
           Update: {
-            address: `0x${string}`
+            address: Hex
           }
         }
         distribution_shares: {
           Row: {
-            address: `0x${string}`
+            address: Hex
           }
           Insert: {
-            address: `0x${string}`
+            address: Hex
           }
           Update: {
-            address: `0x${string}`
+            address: Hex
           }
         }
         webauthn_credentials: {
@@ -60,23 +61,23 @@ export type Database = MergeDeep<
         }
         send_accounts: {
           Row: {
-            address: `0x${string}`
+            address: Hex
             init_code: PgBytea
           }
           Insert: {
-            address: `0x${string}`
+            address: Hex
             init_code: PgBytea
           }
           Update: {
-            address: `0x${string}`
+            address: Hex
             init_code: PgBytea
           }
         }
       }
       Functions: {
         distribution_hodler_addresses: {
           Returns: {
-            address: `0x${string}`
+            address: Hex
             created_at: string
             user_id: string
           }[]