Delete almost all wallet v1 code

and add some code for wallet protocol forms

Author: ekzyis

api/resolvers/vault.js

@@ -1,23 +1,9 @@
 import { E_VAULT_KEY_EXISTS, GqlAuthenticationError, GqlInputError } from '@/lib/error'
-import { getWalletByType } from '@/wallets/common'
-import { deleteVault, hasVault, vaultNewSchematoTypedef, vaultPrismaFragments } from '@/wallets/vault'
 
 export default {
   Query: {
     getVaultEntries: async (parent, args, { me, models }) => {
-      if (!me) throw new GqlAuthenticationError()
-
-      const wallets = await models.wallet.findMany({
-        where: { userId: me.id },
-        include: vaultPrismaFragments.include()
-      })
-
-      const vaultEntries = []
-      for (const wallet of wallets) {
-        vaultEntries.push(...vaultNewSchematoTypedef(wallet).vaultEntries)
-      }
-
-      return vaultEntries
+      // TODO(wallet-v2): this is probably not needed anymore
     }
   },
   Mutation: {
@@ -36,19 +22,10 @@ export default {
 
       return await models.$transaction(async tx => {
         // TODO(wallet-v2): use UserWallet instead of Wallet table
-        const wallets = await tx.wallet.findMany({ where: { userId: me.id } })
-        for (const wallet of wallets) {
-          const def = getWalletByType(wallet.type)
-          // TODO(wallet-v2): use UserWallet instead of Wallet table
-          await tx.wallet.update({
-            where: { id: wallet.id },
-            data: {
-              [def.walletField]: {
-                update: vaultPrismaFragments.upsert({ ...wallet, vaultEntries: entries })
-              }
-            }
-          })
-        }
+        // const wallets = await tx.wallet.findMany({ where: { userId: me.id } })
+        // TODO(wallet-v2): implement this
+        // for (const wallet of wallets) {
+        // }
 
         // optimistic concurrency control: make sure the user's vault key didn't change while we were updating the wallets
         await tx.user.update({
@@ -68,8 +45,8 @@ export default {
       }))
 
       // TODO(wallet-v2): use UserWallet instead of Wallet table
-      const wallets = await models.wallet.findMany({ where: { userId: me.id } })
-      txs.push(...wallets.filter(hasVault).map(wallet => deleteVault(models, wallet)))
+      // const wallets = await models.wallet.findMany({ where: { userId: me.id } })
+      // txs.push(...wallets.filter(hasVault).map(wallet => deleteVault(models, wallet)))
 
       await models.$transaction(txs)
       return true

api/resolvers/wallet.js

@@ -21,10 +21,9 @@ import { finalizeHodlInvoice } from '@/worker/wallet'
 import { lnAddrOptions } from '@/lib/lnurl'
 import { GqlAuthenticationError, GqlAuthorizationError, GqlInputError } from '@/lib/error'
 import { getNodeSockets, getOurPubkey } from '../lnd'
-import { canReceive, getWalletByType } from '@/wallets/common'
 import performPaidAction from '../paidAction'
 import performPayingAction from '../payingAction'
-import { deleteVault, hasVault } from '@/wallets/vault'
+import { logContextFromBolt11 } from '@/wallets/server/logger'
 
 export async function getInvoice (parent, { id }, { me, models, lnd }) {
   const inv = await models.invoice.findUnique({
@@ -165,6 +164,10 @@ const resolvers = {
 
       return [...userWallets, ...walletTemplates]
     },
+    wallet: async (parent, { name }, { me, models }) => {
+      const template = await models.walletTemplate.findFirst({ where: { name } })
+      return { ...template, __resolveType: 'WalletTemplate' }
+    },
     withdrawl: getWithdrawl,
     direct: async (parent, { id }, { me, models }) => {
       if (!me) {
@@ -579,25 +582,7 @@ const resolvers = {
         throw new GqlAuthenticationError()
       }
 
-      // TODO(wallet-v2): use UserWallet instead of Wallet table
-      const wallet = await models.wallet.findUnique({ where: { userId: me.id, id: Number(id) } })
-      if (!wallet) {
-        throw new GqlInputError('wallet not found')
-      }
-
-      const logger = walletLogger({ wallet, models })
-
-      await models.$transaction([
-        hasVault(wallet) ? deleteVault(models, wallet) : null,
-        // TODO(wallet-v2): use UserWallet instead of Wallet table
-        models.wallet.delete({ where: { userId: me.id, id: Number(id) } })
-      ].filter(Boolean))
-
-      if (canReceive({ def: getWalletByType(wallet.type), config: wallet.wallet })) {
-        logger.info('details for receiving deleted')
-      }
-
-      return true
+      // TODO(wallet-v2): implement this
     },
     deleteWalletLogs: async (parent, { wallet }, { me, models }) => {
       if (!me) {
@@ -776,67 +761,6 @@ const resolvers = {
 // TODO(wallet-v2): implement wallet resolvers
 export default resolvers
 
-const logContextFromBolt11 = async (bolt11) => {
-  const decoded = await parsePaymentRequest({ request: bolt11 })
-  return {
-    bolt11,
-    amount: formatMsats(decoded.mtokens),
-    payment_hash: decoded.id,
-    created_at: decoded.created_at,
-    expires_at: decoded.expires_at,
-    description: decoded.description
-  }
-}
-
-export const walletLogger = ({ wallet, models, me }) => {
-  // no-op logger if no wallet or user provided
-  if (!wallet && !me) {
-    return {
-      ok: () => {},
-      info: () => {},
-      error: () => {},
-      warn: () => {}
-    }
-  }
-
-  // server implementation of wallet logger interface on client
-  const log = (level) => async (message, ctx = {}) => {
-    try {
-      let { invoiceId, withdrawalId, ...context } = ctx
-
-      if (context.bolt11) {
-        // automatically populate context from bolt11 to avoid duplicating this code
-        context = {
-          ...context,
-          ...await logContextFromBolt11(context.bolt11)
-        }
-      }
-
-      await models.walletLog.create({
-        data: {
-          userId: wallet?.userId ?? me.id,
-          // system logs have no wallet
-          wallet: wallet?.type,
-          level,
-          message,
-          context,
-          invoiceId,
-          withdrawalId
-        }
-      })
-    } catch (err) {
-      console.error('error creating wallet log:', err)
-    }
-  }
-
-  return {
-    ok: (message, context) => log('SUCCESS')(message, context),
-    info: (message, context) => log('INFO')(message, context),
-    error: (message, context) => log('ERROR')(message, context),
-    warn: (message, context) => log('WARN')(message, context)
-  }
-}
-
 export async function createWithdrawal (parent, { invoice, maxFee }, { me, models, lnd, headers, wallet, logger }) {
   assertApiKeyNotPermitted({ me })
   await validateSchema(withdrawlSchema, { invoice, maxFee })

api/typeDefs/wallet.js

@@ -9,6 +9,7 @@ const typeDefs = gql`
     connectAddress: String!
     walletHistory(cursor: String, inc: String): History
     wallets: [WalletOrTemplate!]!
+    wallet(name: String!): WalletOrTemplate
     walletLogs(type: String, from: String, to: String, cursor: String): WalletLog!
     failedInvoices: [Invoice!]!
   }

components/invoice.js

@@ -8,7 +8,7 @@ import Bolt11Info from './bolt11-info'
 import { useQuery } from '@apollo/client'
 import { INVOICE } from '@/fragments/wallet'
 import { FAST_POLL_INTERVAL, SSR } from '@/lib/constants'
-import { WalletConfigurationError, WalletPaymentAggregateError } from '@/wallets/errors'
+import { WalletConfigurationError, WalletPaymentAggregateError } from '@/wallets/client/errors'
 import ItemJob from './item-job'
 import Item from './item'
 import { CommentFlat } from './comment'

components/item-act.js

@@ -13,7 +13,7 @@ import { usePaidMutation } from './use-paid-mutation'
 import { ACT_MUTATION } from '@/fragments/paidAction'
 import { meAnonSats } from '@/lib/apollo'
 import { BoostItemInput } from './adv-post-form'
-import { useSendWallets } from '@/wallets/index'
+import { useSendWallets } from '@/wallets/client/hooks'
 
 const defaultTips = [100, 1000, 10_000, 100_000]
 

components/log-message.js

@@ -21,8 +21,8 @@ import SearchIcon from '../../svgs/search-line.svg'
 import classNames from 'classnames'
 import SnIcon from '@/svgs/sn.svg'
 import { useHasNewNotes } from '../use-has-new-notes'
-import { useWallets } from '@/wallets/index'
-import { useWalletIndicator } from '@/wallets/indicator'
+// import { useWallets } from '@/wallets/client/hooks'
+import { useWalletIndicator } from '@/wallets/client/hooks'
 import SwitchAccountList, { nextAccount, useAccounts } from '@/components/account'
 import { useShowModal } from '@/components/modal'
 import { numWithUnits } from '@/lib/format'
@@ -295,7 +295,7 @@ export default function LoginButton () {
 
 function LogoutObstacle ({ onClose }) {
   const { registration: swRegistration, togglePushSubscription } = useServiceWorker()
-  const { removeLocalWallets } = useWallets()
+  // const { removeLocalWallets } = useWallets()
   const router = useRouter()
 
   return (
@@ -326,7 +326,8 @@ function LogoutObstacle ({ onClose }) {
               await togglePushSubscription().catch(console.error)
             }
 
-            removeLocalWallets()
+            // TODO(wallet-v2): implement this
+            // removeLocalWallets()
 
             await signOut({ callbackUrl: '/' })
           }}

components/nav/common.js

@@ -7,7 +7,7 @@ import AnonIcon from '@/svgs/spy-fill.svg'
 import styles from './footer.module.css'
 import canvasStyles from './offcanvas.module.css'
 import classNames from 'classnames'
-import { useWalletIndicator } from '@/wallets/indicator'
+import { useWalletIndicator } from '@/wallets/client/hooks'
 
 export default function OffCanvas ({ me, dropNavKey }) {
   const [show, setShow] = useState(false)

components/nav/mobile/offcanvas.js

@@ -8,7 +8,7 @@ import { useRoot } from './root'
 import { ActCanceledError, useAct } from './item-act'
 import { useLightning } from './lightning'
 import { useToast } from './toast'
-import { useSendWallets } from '@/wallets/index'
+import { useSendWallets } from '@/wallets/client/hooks'
 import { Form, SubmitButton } from './form'
 
 export const payBountyCacheMods = {

components/pay-bounty.js

@@ -1,6 +1,6 @@
 import { useApolloClient, useMutation } from '@apollo/client'
 import { useCallback, useMemo } from 'react'
-import { InvoiceCanceledError, InvoiceExpiredError, WalletReceiverError } from '@/wallets/errors'
+import { InvoiceCanceledError, InvoiceExpiredError, WalletReceiverError } from '@/wallets/client/errors'
 import { RETRY_PAID_ACTION } from '@/fragments/paidAction'
 import { INVOICE, CANCEL_INVOICE } from '@/fragments/wallet'