receiver and sender fallback

api/paidAction/index.js

@@ -49,9 +49,9 @@ export default async function performPaidAction (actionType, args, { ...context
     context.me = context.me ? await models.user.findUnique({ where: { id: context.me.id } }) : undefined
     context.cost = await paidAction.getCost(args, context)
     context.sybilFeePercent = await paidAction.getSybilFeePercent?.(args, context)
-    context.attempt = context.attempt ?? 0 // how many times the client thinks it has tried
-    context.forceInternal = context.forceInternal ?? false // use only internal payment methods
-    context.prioritizeInternal = context.prioritizeInternal ?? false // prefer internal payment methods
+    context.attempt ??= 0 // how many times the client thinks it has tried
+    context.forceInternal ??= false // use only internal payment methods
+    context.prioritizeInternal ??= false // prefer internal payment methods
     context.description = context.me?.hideInvoiceDesc ? undefined : await paidAction.describe?.(args, context)
     context.descriptionHash = await paidAction.describeHash?.(args, context)
     context.supportedPaymentMethods = paidAction.paymentMethods ?? await paidAction.getPaymentMethods?.(args, context) ?? []
@@ -108,7 +108,7 @@ export default async function performPaidAction (actionType, args, { ...context
 
       if (paymentMethod === PAID_ACTION_PAYMENT_METHODS.P2P) {
         try {
-          return await performP2PAction(actionType, args, context, paymentMethod)
+          return await performP2PAction(actionType, args, context)
         } catch (e) {
           // p2p can fail for various reasons, if it does, we should try another payment method
           console.error('paid action failed with P2P payment method, try another one', e)
@@ -238,7 +238,7 @@ async function performP2PAction (actionType, args, { ...context }) {
     description,
     descriptionHash,
     expiry: INVOICE_EXPIRE_SECS,
-    skipWallets: attempt
+    walletOffset: attempt
   }, { models, me, lnd })
 
   context.invoiceArgs = {
@@ -291,6 +291,7 @@ export async function retryPaidAction ({ invoiceId, forceInternal, attempt, prio
   context.prioritizeInternal = prioritizeInternal
 
   return await models.$transaction(async tx => {
+    context.tx = tx
     const supportRetrying = paidAction.retry
     if (supportRetrying) {
       // update the old invoice to RETRYING, so that it's not confused with FAILED

components/payment.js

@@ -115,7 +115,7 @@ export const useWalletPayment = () => {
   const defaultWallet = useWallet()
 
   const waitForWalletPayment = useCallback(async ({ id, bolt11 }, waitFor, wallet) => {
-    wallet = wallet ?? defaultWallet
+    wallet ??= defaultWallet
     if (!wallet) {
       throw new NoAttachedWalletError()
     }

components/qr.js

@@ -21,10 +21,8 @@ export default function Qr ({ asIs, value, useWallet: automated, statusVariant,
 
   useEffect(() => {
     async function effect () {
-      const usableWallets = wallets.filter(w => !w.def.isAvailable || w.def.isAvailable())
-        .filter(w => w.config?.enabled && canSend(w))[0]
-      if (automated && usableWallets.length > 0) {
-        for (const wallet of usableWallets) {
+      if (automated && wallets.length > 0) {
+        for (const wallet of wallets) {
           try {
             await wallet.sendPayment(value)
             break

wallets/server.js

@@ -1,18 +1,18 @@
 // import server side wallets
-import * as lnd from '@wallets/lnd/server'
-import * as cln from '@wallets/cln/server'
-import * as lnAddr from '@wallets/lightning-address/server'
-import * as lnbits from 'wallets/lnbits/server'
-import * as nwc from '@wallets/nwc/server'
-import * as phoenixd from '@wallets/phoenixd/server'
-import * as blink from '@wallets/blink/server'
+import * as lnd from '@/wallets/lnd/server'
+import * as cln from '@/wallets/cln/server'
+import * as lnAddr from '@/wallets/lightning-address/server'
+import * as lnbits from '@/wallets/lnbits/server'
+import * as nwc from '@/wallets/nwc/server'
+import * as phoenixd from '@/wallets/phoenixd/server'
+import * as blink from '@/wallets/blink/server'
 
 // we import only the metadata of client side wallets
-import * as lnc from '@wallets/lnc'
-import * as webln from '@wallets/webln'
+import * as lnc from '@/wallets/lnc'
+import * as webln from '@/wallets/webln'
 
 import { walletLogger } from '@/api/resolvers/wallet'
-import walletDefs from '@wallets/server'
+import walletDefs from '@/wallets/server'
 import { parsePaymentRequest } from 'ln-service'
 import { toNumber, toPositiveBigInt } from '@/lib/validate'
 import { PAID_ACTION_TERMINAL_STATES } from '@/lib/constants'
@@ -25,7 +25,7 @@ export default [lnd, cln, lnAddr, lnbits, nwc, phoenixd, blink, lnc, webln]
 
 const MAX_PENDING_INVOICES_PER_WALLET = 25
 
-export async function createInvoice (userId, { msats, description, descriptionHash, expiry = 360, wrap = false, feePercent, skipWallets = 0 }, { models, me, lnd }) {
+export async function createInvoice (userId, { msats, description, descriptionHash, expiry = 360, wrap = false, feePercent, walletOffset = 0 }, { models, me, lnd }) {
   // get the wallets in order of priority
   const wallets = await getInvoiceableWallets(userId, { models })
 
@@ -37,7 +37,8 @@ export async function createInvoice (userId, { msats, description, descriptionHa
     innerMsats = msats * (100n - feePercent) / 100n
   }
 
-  for (let i = toNumber(Math.min(skipWallets, wallets.length), 0, wallets.length); i < wallets.length; i++) {
+  const offset = toNumber(Math.min(walletOffset, wallets.length), 0, wallets.length)
+  for (let i = offset; i < wallets.length; i++) {
     const { def, wallet } = wallets[i]
 
     const config = wallet.wallet
@@ -108,7 +109,7 @@ export async function createInvoice (userId, { msats, description, descriptionHa
 }
 
 export async function createWrappedInvoice (userId,
-  { msats, feePercent, description, descriptionHash, expiry = 360, skipWallets = 0 },
+  { msats, feePercent, description, descriptionHash, expiry = 360, walletOffset = 0 },
   { models, me, lnd }) {
   return await createInvoice(userId, {
     // this is the amount the stacker will receive, the other (feePercent)% is our fee
@@ -118,7 +119,7 @@ export async function createWrappedInvoice (userId,
     description,
     descriptionHash,
     expiry,
-    skipWallets
+    walletOffset
   }, { models, me, lnd })
 }