Wallet v2

.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/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/resolvers/index.js

@@ -2,6 +2,7 @@ import user from './user'
 import message from './message'
 import item from './item'
 import wallet from './wallet'
+import userWallet 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, wallet, userWallet, 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]