feat(wallet-sdk): accounts slice (step 6)

.claude/settings.json

@@ -27,7 +27,7 @@
       "Bash(pnpm:*)",
       "Read(.env)",
       "Read(.env.*)",
-      "Read(supabase/.env)"
+      "Read(packages/wallet-sdk/db/supabase/.env)"
     ]
   },
   "hooks": {

.claude/skills/supabase-database/SKILL.md

@@ -21,6 +21,6 @@ Expert guidance for Postgres database work in a Supabase environment.
 - Write all SQL in lowercase
 - Always enable RLS on new tables
 - Separate RLS policies per operation (select/insert/update/delete) and per role (anon/authenticated)
-- Migration files: `YYYYMMDDHHmmss_short_description.sql` in `packages/wallet-sdk/supabase/migrations/`
+- Migration files: `YYYYMMDDHHmmss_short_description.sql` in `packages/wallet-sdk/db/supabase/migrations/`
 - Functions default to `SECURITY INVOKER` with `set search_path = ''`
 - Use fully qualified names (e.g., `public.table_name`) in functions

.claude/skills/supabase-database/references/migrations.md

@@ -4,7 +4,7 @@ This project uses the migrations provided by the Supabase CLI.
 
 ## Creating a migration file
 
-Create migration files inside `packages/wallet-sdk/supabase/migrations/`.
+Create migration files inside `packages/wallet-sdk/db/supabase/migrations/`.
 
 The file MUST be named in the format `YYYYMMDDHHmmss_short_description.sql` with proper casing for months, minutes, and seconds in UTC time:
 

.github/workflows/ci.yml

@@ -4,8 +4,8 @@ on:
   pull_request:
 
 env:
-  SELF_SIGNED_CERT_PATH: "../../../certs/ci-localhost-cert.pem"
-  SELF_SIGNED_CERT_KEY_PATH: "../../../certs/ci-localhost-key.pem"
+  SELF_SIGNED_CERT_PATH: "../../../../certs/ci-localhost-cert.pem"
+  SELF_SIGNED_CERT_KEY_PATH: "../../../../certs/ci-localhost-key.pem"
 
 jobs:
   code-checks:
@@ -28,7 +28,7 @@ jobs:
           MIGRATIONS_CHANGED=false
           CLI_VERSION_CHANGED=false
 
-          if ! git diff --quiet origin/${{ github.base_ref }}..HEAD -- packages/wallet-sdk/supabase/migrations/; then
+          if ! git diff --quiet origin/${{ github.base_ref }}..HEAD -- packages/wallet-sdk/db/supabase/migrations/; then
             MIGRATIONS_CHANGED=true
           fi
 
@@ -50,9 +50,9 @@ jobs:
           fi
 
           echo "Checking types..."
-          bun supabase db start --workdir packages/wallet-sdk
-          bun supabase gen types typescript --local --schema wallet --workdir packages/wallet-sdk > packages/wallet-sdk/supabase/database.types.ts
-          if ! git diff --ignore-space-at-eol --exit-code --quiet packages/wallet-sdk/supabase/database.types.ts; then
+          bun supabase db start --workdir packages/wallet-sdk/db
+          bun supabase gen types typescript --local --schema wallet --workdir packages/wallet-sdk/db > packages/wallet-sdk/db/supabase/database.types.ts
+          if ! git diff --ignore-space-at-eol --exit-code --quiet packages/wallet-sdk/db/supabase/database.types.ts; then
             echo "Detected uncommitted changes in database types. This means that db was changed but types were not updated. To fix regenerate the types and commit the changes. See missing types below:"
             git diff
             exit 1

README.md

@@ -178,18 +178,18 @@ hosted on Supabase. Sensitive data is encrypted with the key from the Open Secre
 logged-in user. While developing locally, the local Supabase stack is used. To start it, run `bun run supabase start` command.
 To stop it, run `bun run supabase stop` command. The start command will start the database and realtime service, plus other
 services useful for development, like Supabase Studio. You can use Supabase Studio to inspect the database and run queries.
-Supabase is configured in the `packages/wallet-sdk/supabase/config.toml` file.
+Supabase is configured in the `packages/wallet-sdk/db/supabase/config.toml` file.
 
 ### Database migrations
 
-Schema changes to the Postgres database should be done using migrations. Migrations are stored in the `packages/wallet-sdk/supabase/migrations`
+Schema changes to the Postgres database should be done using migrations. Migrations are stored in the `packages/wallet-sdk/db/supabase/migrations`
 folder. Always try to make the schema changes in a backward compatible way.
 
 Database migrations can be done in two ways:
 1. Using Supabase Studio. With this approach you can make db changes directly to your local database in the Studio UI
    and then run `bun supabase db diff --file <MIGRATION_NAME>` to create a migration file for the changes.
 2. Using `bun supabase migration new <MIGRATION_NAME>`. This command will create a new empty migration file in the 
-   `packages/wallet-sdk/supabase/migrations` folder where you can then write the SQL commands to make the changes. To apply the migration to
+   `packages/wallet-sdk/db/supabase/migrations` folder where you can then write the SQL commands to make the changes. To apply the migration to
    the local database run `bun supabase db push`.
 
 To keep the db TypeScript types in sync with the database schema run `bun run db:generate-types` command. If you forget

apps/web-wallet-e2e/.env.test

@@ -8,8 +8,8 @@ VITE_SENTRY_HOST='o4509706567680000.ingest.us.sentry.io'
 VITE_SENTRY_PROJECT_ID='4509707316690944'
 VITE_SENTRY_DSN='https://3e5837ba4db251e806915155170ef71b@${VITE_SENTRY_HOST}/${VITE_SENTRY_PROJECT_ID}'
 VITE_ENVIRONMENT='local'
-SELF_SIGNED_CERT_PATH='../../../certs/localhost-cert.pem'
-SELF_SIGNED_CERT_KEY_PATH='../../../certs/localhost-key.pem'
+SELF_SIGNED_CERT_PATH='../../../../certs/localhost-cert.pem'
+SELF_SIGNED_CERT_KEY_PATH='../../../../certs/localhost-key.pem'
 NODE_TLS_REJECT_UNAUTHORIZED=0
 LNURL_SERVER_SPARK_MNEMONIC='half vanish taxi again drill detail neglect park harsh setup involve dawn'
 LNURL_SERVER_ENCRYPTION_KEY="a8861cc3e5b3caf5573fbba2da2851a4e608a836eef10074be36ae0ca147b518"

apps/web-wallet-e2e/e2e/fixtures/open-secret/fixture.ts

@@ -1,7 +1,7 @@
 import * as crypto from 'node:crypto';
+import { delay } from '@agicash/utils';
 import { type Page, type Route, test as base, expect } from '@playwright/test';
 import { decode } from '@stablelib/base64';
-import delay from '~/lib/delay';
 import { session } from '../../mocks/open-secret';
 import { openSecretEncryption } from './encryption';
 

apps/web-wallet-e2e/package.json

@@ -8,6 +8,7 @@
   },
   "devDependencies": {
     "@agicash/opensecret": "catalog:",
+    "@agicash/utils": "workspace:*",
     "@playwright/test": "1.49.1",
     "@stablelib/base64": "catalog:",
     "@stablelib/chacha20poly1305": "catalog:",

apps/web-wallet/app/entry.client.tsx

@@ -1,4 +1,3 @@
-import { configure } from '@agicash/opensecret';
 import {
   configureFeatureFlags,
   ensureBreezWasm,
@@ -15,6 +14,13 @@ import { HydratedRouter } from 'react-router/dom';
 import { getEnvironment, isServedLocally } from './environment';
 import { agicashDbClient } from './features/agicash-db/database.client';
 import { loadFeatureFlags } from './features/shared/feature-flags';
+// Side-effect import: evaluating this module constructs the SDK, which
+// configures Open Secret. loadFeatureFlags() below relies on that — for a
+// returning user it fetches user-targeted flags with a token minted through
+// Open Secret — so the construction has to run before the body. Temporary: a
+// later slice constructs the SDK explicitly at boot and moves feature flags
+// onto the instance, dropping this ordering dependency (PR #1166).
+import './features/shared/sdk.client';
 import { registerMoneyDevToolsFormatter } from './lib/money-devtools-formatter';
 import { getTracesSampleRate, sanitizeUrl } from './tracing-utils';
 
@@ -23,21 +29,6 @@ if (process.env.NODE_ENV === 'development') {
   registerMoneyDevToolsFormatter();
 }
 
-const openSecretApiUrl = import.meta.env.VITE_OPEN_SECRET_API_URL ?? '';
-if (!openSecretApiUrl) {
-  throw new Error('VITE_OPEN_SECRET_API_URL is not set');
-}
-
-const openSecretClientId = import.meta.env.VITE_OPEN_SECRET_CLIENT_ID ?? '';
-if (!openSecretClientId) {
-  throw new Error('VITE_OPEN_SECRET_CLIENT_ID is not set');
-}
-
-configure({
-  apiUrl: openSecretApiUrl,
-  clientId: openSecretClientId,
-});
-
 // Start Breez WASM fetch/compile as early as possible so it overlaps with
 // hydration, Sentry init, and the auth query — by the time the _protected
 // middleware awaits it, init is often already done.

apps/web-wallet/app/features/accounts/account-hooks.ts

@@ -1,20 +1,19 @@
 import { type Currency, Money } from '@agicash/money';
-import type {
-  Account,
-  AccountPurpose,
-  AccountState,
-  AccountType,
-  CashuAccount,
-  ExtendedAccount,
-  SparkAccount,
+import {
+  type Account,
+  type AccountPurpose,
+  type AccountState,
+  type AccountType,
+  type AddCashuAccountParams,
+  type CashuAccount,
+  type ExtendedAccount,
+  type SparkAccount,
+  getExtendedAccounts,
 } from '@agicash/wallet-sdk';
-import type {
-  AccountRepository,
-  AgicashDbAccountWithProofs,
-} from '@agicash/wallet-sdk/temporary';
+import type { AgicashDbAccountWithProofs } from '@agicash/wallet-sdk/temporary';
 import {
-  UserService,
   getAccountBalance,
+  getInternalAccountRepository,
   sparkDebugLog,
 } from '@agicash/wallet-sdk/temporary';
 import {
@@ -26,9 +25,8 @@ import {
   useSuspenseQuery,
 } from '@tanstack/react-query';
 import { useCallback, useMemo, useRef } from 'react';
+import { sdk } from '~/features/shared/sdk.client';
 import { useUser } from '../user/user-hooks';
-import { useAccountRepository } from './account-repository-hooks';
-import { useAccountService } from './account-service-hooks';
 
 export class AccountsCache {
   public static Key = 'accounts';
@@ -117,34 +115,32 @@ export function useAccountsCache() {
  * Hook that returns an account change handlers.
  */
 export function useAccountChangeHandlers() {
-  const accountRepository = useAccountRepository();
   const accountCache = useAccountsCache();
 
   return [
     {
       event: 'ACCOUNT_CREATED',
       handleEvent: async (payload: AgicashDbAccountWithProofs) => {
+        const accountRepository = await getInternalAccountRepository();
         const addedAccount = await accountRepository.toAccount(payload);
         accountCache.upsert(addedAccount);
       },
     },
     {
       event: 'ACCOUNT_UPDATED',
       handleEvent: async (payload: AgicashDbAccountWithProofs) => {
+        const accountRepository = await getInternalAccountRepository();
         const updatedAccount = await accountRepository.toAccount(payload);
         accountCache.upsert(updatedAccount);
       },
     },
   ];
 }
 
-export const accountsQueryOptions = ({
-  userId,
-  accountRepository,
-}: { userId: string; accountRepository: AccountRepository }) => {
+export const accountsQueryOptions = () => {
   return queryOptions({
     queryKey: [AccountsCache.Key],
-    queryFn: () => accountRepository.getAllActive(userId),
+    queryFn: () => sdk.accounts.list(),
     staleTime: Number.POSITIVE_INFINITY,
     // Refetches use `getAllActive`, so any expired account previously in the
     // cache (lazy-fetched via useAccountOrNull, or just expired before the
@@ -253,18 +249,17 @@ export function useAccounts<
   select?: UseAccountsSelect<T, P>,
 ): UseSuspenseQueryResult<ExtendedAccount<T>[]> {
   const user = useUser();
-  const accountRepository = useAccountRepository();
 
   const { currency, type, isOnline, purpose, state = 'active' } = select ?? {};
 
   return useSuspenseQuery({
-    ...accountsQueryOptions({ userId: user.id, accountRepository }),
+    ...accountsQueryOptions(),
     refetchOnWindowFocus: 'always',
     refetchOnReconnect: 'always',
     select: useCallback(
       (data: Account[]) => {
         const allowedStates = Array.isArray(state) ? state : [state];
-        const extendedData = UserService.getExtendedAccounts(user, data);
+        const extendedData = getExtendedAccounts(user, data);
 
         const filteredData = extendedData.filter((account) => {
           if (!allowedStates.includes(account.state)) {
@@ -330,14 +325,13 @@ const ALL_ACCOUNT_STATES: AccountState[] = ['active', 'expired'];
  */
 export function useAccountOrNull(id: string | null): Account | null {
   const accountsCache = useAccountsCache();
-  const accountRepository = useAccountRepository();
   const { data: accounts } = useAccounts({ state: ALL_ACCOUNT_STATES });
 
   useSuspenseQuery({
     queryKey: ['fetch-account-by-id', id],
     queryFn: async () => {
       if (!id || accountsCache.get(id)) return null;
-      const fetched = await accountRepository.get(id);
+      const fetched = await sdk.accounts.get(id);
       if (fetched) accountsCache.upsert(fetched);
       return null;
     },
@@ -468,14 +462,11 @@ export function useAccountOrDefault(accountId: string | null) {
 }
 
 export function useAddCashuAccount() {
-  const userId = useUser((x) => x.id);
   const accountCache = useAccountsCache();
-  const accountService = useAccountService();
 
   const { mutateAsync } = useMutation({
-    mutationFn: async (
-      account: Parameters<typeof accountService.addCashuAccount>[0]['account'],
-    ) => accountService.addCashuAccount({ userId, account }),
+    mutationFn: (params: AddCashuAccountParams) =>
+      sdk.accounts.cashu.add(params),
     onSuccess: (account) => {
       // We add the account as soon as it is created so that it is available in the cache immediately.
       // This is important when using other hooks that are trying to use the account immediately after it is created.

apps/web-wallet/app/features/agicash-db/database.client.ts

@@ -1,36 +1,9 @@
 import type { Database } from '@agicash/wallet-sdk/temporary';
 import { createClient } from '@supabase/supabase-js';
+import { supabaseAnonKey, supabaseUrl } from '~/features/shared/sdk.client';
 import { SupabaseRealtimeManager } from '~/lib/supabase';
 import { getSupabaseSessionToken } from './supabase-session';
 
-const getSupabaseUrl = () => {
-  const supabaseUrl = import.meta.env.VITE_SUPABASE_URL ?? '';
-  if (!supabaseUrl) {
-    throw new Error('VITE_SUPABASE_URL is not set');
-  }
-
-  if (
-    supabaseUrl.includes('127.0.0.1') &&
-    typeof window !== 'undefined' &&
-    window.location.protocol === 'https:' &&
-    (window.location.hostname.endsWith('.local') ||
-      window.location.hostname.startsWith('192.168.') ||
-      window.location.hostname.startsWith('10.') ||
-      /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(window.location.hostname))
-  ) {
-    return supabaseUrl.replace('127.0.0.1', window.location.hostname);
-  }
-
-  return supabaseUrl;
-};
-
-const supabaseUrl = getSupabaseUrl();
-
-const supabaseAnonKey = import.meta.env.VITE_SUPABASE_ANON_KEY ?? '';
-if (!supabaseAnonKey) {
-  throw new Error('VITE_SUPABASE_ANON_KEY is not set');
-}
-
 /**
  * The client-side Supabase database client.
  * If you need to use a client on the server, which bypasses RLS, use `agicashDbServer` instead.

apps/web-wallet/app/features/gift-cards/add-gift-card.tsx

@@ -39,7 +39,6 @@ function useAddGiftCard() {
       name,
       currency,
       mintUrl: url,
-      type: 'cashu',
       purpose: 'gift-card',
     });
 }

apps/web-wallet/app/features/receive/cashu-receive-quote-hooks.ts

@@ -5,6 +5,12 @@ import {
   sumProofs,
 } from '@agicash/cashu';
 import type { Money } from '@agicash/money';
+import {
+  type LongTimeout,
+  clearLongTimeout,
+  setLongTimeout,
+  withRetry,
+} from '@agicash/utils';
 import type {
   CashuAccount,
   CashuReceiveQuote,
@@ -34,24 +40,18 @@ import {
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useOnMeltQuoteStateChange } from '~/lib/cashu/melt-quote-subscription';
 import { MintQuoteSubscriptionManager } from '~/lib/cashu/mint-quote-subscription-manager';
-import {
-  type LongTimeout,
-  clearLongTimeout,
-  setLongTimeout,
-} from '~/lib/timeout';
 import { useLatest } from '~/lib/use-latest';
-import { withRetry } from '~/lib/with-retry';
 import {
   useGetCashuAccount,
   useGetCashuAccountByMintUrlAndCurrency,
   useSelectItemsWithOnlineAccount,
 } from '../accounts/account-hooks';
-import { useAccountRepository } from '../accounts/account-repository-hooks';
 import { agicashDbClient } from '../agicash-db/database.client';
 import { useCashuCryptography } from '../shared/cashu-hooks';
 import { useEncryption } from '../shared/encryption-hooks';
 import { useTransactionsCache } from '../transactions/transaction-hooks';
 import { useUser } from '../user/user-hooks';
+import { useAccountRepository } from './account-repository-hooks';
 
 type CreateProps = {
   account: CashuAccount;

apps/web-wallet/app/features/receive/cashu-receive-swap-hooks.ts

@@ -17,10 +17,10 @@ import {
   useGetCashuAccount,
   useSelectItemsWithOnlineAccount,
 } from '../accounts/account-hooks';
-import { useAccountRepository } from '../accounts/account-repository-hooks';
 import { agicashDbClient } from '../agicash-db/database.client';
 import { useEncryption } from '../shared/encryption-hooks';
 import { useUser } from '../user/user-hooks';
+import { useAccountRepository } from './account-repository-hooks';
 
 type CreateProps = {
   token: Token;

apps/web-wallet/app/features/settings/accounts/add-mint-form.tsx

@@ -100,7 +100,6 @@ export function AddMintForm() {
         name: data.name,
         currency: ACCOUNT_CURRENCY,
         mintUrl: data.mintUrl,
-        type: 'cashu',
         purpose,
       });
       toast({