Merge branch 'master' into live_comments

Author: huumn

.gitignore

@@ -53,6 +53,7 @@ docker-compose.*.yml
 *.sql
 !/prisma/migrations/*/*.sql
 !/docker/db/seed.sql
+!/docker/db/wallet-seed.sql
 
 # nostr wallet connect
 scripts/nwc-keys.json

api/paidAction/index.js

@@ -227,7 +227,7 @@ async function performP2PAction (actionType, args, incomingContext) {
     await assertBelowMaxPendingInvoices(incomingContext)
 
     const description = await paidActions[actionType].describe(args, incomingContext)
-    const { invoice, wrappedInvoice, wallet, maxFee } = await createWrappedInvoice(userId, {
+    const { invoice, wrappedInvoice, protocol, maxFee } = await createWrappedInvoice(userId, {
       msats: cost,
       feePercent: sybilFeePercent,
       description,
@@ -239,7 +239,7 @@ async function performP2PAction (actionType, args, incomingContext) {
       invoiceArgs: {
         bolt11: invoice,
         wrappedBolt11: wrappedInvoice,
-        wallet,
+        protocol,
         maxFee
       }
     }
@@ -269,7 +269,7 @@ async function performDirectAction (actionType, args, incomingContext) {
 
     const description = actionDescription ?? await paidActions[actionType].describe(args, incomingContext)
 
-    for await (const { invoice, logger, wallet } of createUserInvoice(userId, {
+    for await (const { invoice, logger, protocol } of createUserInvoice(userId, {
       msats: cost,
       description,
       expiry: INVOICE_EXPIRE_SECS
@@ -293,7 +293,7 @@ async function performDirectAction (actionType, args, incomingContext) {
               bolt11: invoice,
               msats: cost,
               hash,
-              walletId: wallet.id,
+              protocolId: protocol.id,
               receiverId: userId
             }
           }),
@@ -346,22 +346,26 @@ export async function retryPaidAction (actionType, args, incomingContext) {
       invoiceId: failedInvoice.id
     },
     include: {
-      wallet: true
+      protocol: {
+        include: {
+          wallet: true
+        }
+      }
     }
   })
 
   if (invoiceForward) {
     // this is a wrapped invoice, we need to retry it with receiver fallbacks
     try {
-      const { userId } = invoiceForward.wallet
+      const { userId } = invoiceForward.protocol.wallet
       // this will return an invoice from the first receiver wallet that didn't fail yet and throw if none is available
-      const { invoice: bolt11, wrappedInvoice: wrappedBolt11, wallet, maxFee } = await createWrappedInvoice(userId, {
+      const { invoice: bolt11, wrappedInvoice: wrappedBolt11, protocol, maxFee } = await createWrappedInvoice(userId, {
         msats: failedInvoice.msatsRequested,
         feePercent: await action.getSybilFeePercent?.(actionArgs, retryContext),
         description: await action.describe?.(actionArgs, retryContext),
         expiry: INVOICE_EXPIRE_SECS
       }, retryContext)
-      invoiceArgs = { bolt11, wrappedBolt11, wallet, maxFee }
+      invoiceArgs = { bolt11, wrappedBolt11, protocol, maxFee }
     } catch (err) {
       console.log('failed to retry wrapped invoice, falling back to SN:', err)
     }
@@ -429,7 +433,7 @@ async function createSNInvoice (actionType, args, context) {
 
 async function createDbInvoice (actionType, args, context) {
   const { me, models, tx, cost, optimistic, actionId, invoiceArgs, paymentAttempt, predecessorId } = context
-  const { bolt11, wrappedBolt11, preimage, wallet, maxFee } = invoiceArgs
+  const { bolt11, wrappedBolt11, preimage, protocol, maxFee } = invoiceArgs
 
   const db = tx ?? models
 
@@ -468,9 +472,9 @@ async function createDbInvoice (actionType, args, context) {
         invoice: {
           create: invoiceData
         },
-        wallet: {
+        protocol: {
           connect: {
-            id: wallet.id
+            id: protocol.id
           }
         }
       }

api/paidAction/zap.js

@@ -39,11 +39,11 @@ export async function getInvoiceablePeer ({ id, sats, hasSendWallet }, { models,
     return null
   }
 
-  const wallets = await getInvoiceableWallets(item.userId, { models })
+  const protocols = await getInvoiceableWallets(item.userId, { models })
 
   // request peer invoice if they have an attached wallet and have not forwarded the item
   // and the receiver doesn't want to receive credits
-  if (wallets.length > 0 &&
+  if (protocols.length > 0 &&
     item.itemForwards.length === 0 &&
     sats >= item.user.receiveCreditsBelowSats) {
     return item.userId

api/payingAction/index.js

@@ -6,9 +6,9 @@ import { parsePaymentRequest, payViaPaymentRequest } from 'ln-service'
 // paying actions are completely distinct from paid actions
 // and there's only one paying action: send
 // ... still we want the api to at least be similar
-export default async function performPayingAction ({ bolt11, maxFee, walletId }, { me, models, lnd }) {
+export default async function performPayingAction ({ bolt11, maxFee, protocolId }, { me, models, lnd }) {
   try {
-    console.group('performPayingAction', `${bolt11.slice(0, 10)}...`, maxFee, walletId)
+    console.group('performPayingAction', `${bolt11.slice(0, 10)}...`, maxFee, protocolId)
 
     if (!me) {
       throw new Error('You must be logged in to perform this action')
@@ -34,8 +34,8 @@ export default async function performPayingAction ({ bolt11, maxFee, walletId },
           msatsPaying: toPositiveBigInt(decoded.mtokens),
           msatsFeePaying: satsToMsats(maxFee),
           userId: me.id,
-          walletId,
-          autoWithdraw: !!walletId
+          protocolId,
+          autoWithdraw: !!protocolId
         }
       })
     }, { isolationLevel: Prisma.TransactionIsolationLevel.ReadCommitted })

api/resolvers/index.js

@@ -1,7 +1,8 @@
 import user from './user'
 import message from './message'
 import item from './item'
-import wallet from './wallet'
+import walletV1 from './wallet'
+import walletV2 from '@/wallets/server/resolvers'
 import lnurl from './lnurl'
 import notifications from './notifications'
 import invite from './invite'
@@ -19,7 +20,6 @@ import chainFee from './chainFee'
 import { GraphQLScalarType, Kind } from 'graphql'
 import { createIntScalar } from 'graphql-scalar'
 import paidAction from './paidAction'
-import vault from './vault'
 
 const date = new GraphQLScalarType({
   name: 'Date',
@@ -54,6 +54,6 @@ const limit = createIntScalar({
   maximum: 1000
 })
 
-export default [user, item, message, wallet, lnurl, notifications, invite, sub,
+export default [user, item, message, walletV1, walletV2, lnurl, notifications, invite, sub,
   upload, search, growth, rewards, referrals, price, admin, blockHeight, chainFee,
-  { JSONObject }, { Date: date }, { Limit: limit }, paidAction, vault]
+  { JSONObject }, { Date: date }, { Limit: limit }, paidAction]

api/resolvers/notifications.js

@@ -2,7 +2,7 @@ import { decodeCursor, LIMIT, nextNoteCursorEncoded } from '@/lib/cursor'
 import { getItem, filterClause, whereClause, muteClause, activeOrMine } from './item'
 import { getInvoice, getWithdrawl } from './wallet'
 import { pushSubscriptionSchema, validateSchema } from '@/lib/validate'
-import { replyToSubscription } from '@/lib/webPush'
+import { sendPushSubscriptionReply } from '@/lib/webPush'
 import { getSub } from './sub'
 import { GqlAuthenticationError, GqlInputError } from '@/lib/error'
 import { WALLET_MAX_RETRIES, WALLET_RETRY_BEFORE_MS } from '@/lib/constants'
@@ -439,7 +439,7 @@ export default {
         console.log(`[webPush] created subscription for user ${me.id}: endpoint=${endpoint}`)
       }
 
-      await replyToSubscription(dbPushSubscription.id, { title: 'Stacker News notifications are now active' })
+      await sendPushSubscriptionReply(dbPushSubscription)
 
       return dbPushSubscription
     },