fix retry fallbacks that truncate msats

huumn · huumn · commit 59dc85f6c9ba · 2025-11-21T23:23:16.000-06:00
diff --git a/api/payIn/index.js b/api/payIn/index.js
@@ -7,15 +7,14 @@ import { msatsToSats } from '@/lib/format'
 import { payInBolt11Prospect, payInBolt11WrapProspect } from './lib/payInBolt11'
 import { isPessimistic, isProxyPayment, isWithdrawal } from './lib/is'
 import { PAY_IN_INCLUDE, payInCreate } from './lib/payInCreate'
-import { NoReceiveWalletError, payOutBolt11Replacement } from './lib/payOutBolt11'
 import { payInClone } from './lib/payInPrisma'
 import { createHmac } from '../resolvers/wallet'
-import { payOutCustodialTokenFromBolt11 } from './lib/payOutCustodialTokens'
 
 // grab a greedy connection for the payIn system on any server
 // if we have lock contention of payIns, we don't want to block other queries
 import createPrisma from '@/lib/create-prisma'
 import { PayInFailureReasonError } from './errors'
+import { payInReplacePayOuts } from './lib/payInFailed'
 const models = createPrisma({ connectionParams: { connection_limit: 2 } })
 
 export default async function pay (payInType, payInArgs, { me, custodialOnly }) {
@@ -371,43 +370,24 @@ export async function retry (payInId, { me }) {
     }
     const where = { id: payInId, userId: me.id, payInState: 'FAILED', successorId: null, benefactorId: null }
 
-    const payInFailed = await models.payIn.findFirst({
+    const payInFailedInitial = await models.payIn.findFirst({
       where,
       include: { ...include, beneficiaries: { include } }
     })
-    if (!payInFailed) {
+    if (!payInFailedInitial) {
       throw new Error('PayIn with id ' + payInId + ' not found')
     }
-    if (isWithdrawal(payInFailed)) {
+    if (isWithdrawal(payInFailedInitial)) {
       throw new Error('Withdrawal payIns cannot be retried')
     }
-    if (isPessimistic(payInFailed, { me })) {
+    if (isPessimistic(payInFailedInitial, { me })) {
       throw new Error('Pessimistic payIns cannot be retried')
     }
 
-    let payOutBolt11
-    if (payInFailed.payOutBolt11) {
-      try {
-        payOutBolt11 = await payOutBolt11Replacement(models, payInFailed.genesisId ?? payInFailed.id, payInFailed.payOutBolt11)
-      } catch (e) {
-        console.error('payOutBolt11Replacement failed', e)
-        if (!(e instanceof NoReceiveWalletError)) {
-          throw e
-        }
-        // if we can no longer produce a payOutBolt11, we fallback to custodial tokens
-        payInFailed.payOutCustodialTokens.push(payOutCustodialTokenFromBolt11(payInFailed.payOutBolt11))
-        // convert the routing fee to another rewards pool output
-        const routingFee = payInFailed.payOutCustodialTokens.find(t => t.payOutType === 'ROUTING_FEE')
-        if (routingFee) {
-          routingFee.payOutType = 'REWARDS_POOL'
-          routingFee.userId = USER_ID.rewards
-        }
-        payInFailed.payOutBolt11 = null
-      }
-    }
+    const payInFailed = await payInReplacePayOuts(models, payInFailedInitial)
 
     const { payIn, result, mCostRemaining } = await models.$transaction(async tx => {
-      const payInInitial = { ...payInClone({ ...payInFailed, payOutBolt11 }), retryCount: payInFailed.retryCount + 1 }
+      const payInInitial = { ...payInClone(payInFailed), retryCount: payInFailed.retryCount + 1 }
       await obtainRowLevelLocks(tx, payInInitial)
       const { payIn, mCostRemaining } = await payInCreate(tx, payInInitial, undefined, { me })
 
diff --git a/api/payIn/lib/payInFailed.js b/api/payIn/lib/payInFailed.js
@@ -0,0 +1,44 @@
+import { USER_ID } from '@/lib/constants'
+import { NoReceiveWalletError, payOutBolt11Replacement } from './payOutBolt11'
+import { payOutCustodialTokenFromBolt11 } from './payOutCustodialTokens'
+
+export async function payInReplacePayOuts (models, payInFailedInitial) {
+  if (!payInFailedInitial.payOutBolt11) {
+    return payInFailedInitial
+  }
+
+  const payInFailed = { ...payInFailedInitial }
+  try {
+    payInFailed.payOutBolt11 = await payOutBolt11Replacement(models, payInFailed.genesisId ?? payInFailed.id, payInFailed.payOutBolt11)
+    // it's possible that the replacement payOutBolt11 is less than the original
+    // due to msats truncation ... so we need to add the difference to the rewards pool
+    if (payInFailed.payOutBolt11.msats !== payInFailedInitial.payOutBolt11.msats) {
+      if (payInFailed.payOutBolt11.msats < payInFailedInitial.payOutBolt11.msats) {
+        const excessMsats = payInFailedInitial.payOutBolt11.msats - payInFailed.payOutBolt11.msats
+        payInFailed.payOutCustodialTokens.push({
+          payOutType: 'REWARDS_POOL',
+          userId: USER_ID.rewards,
+          custodialTokenType: 'SATS',
+          mtokens: excessMsats
+        })
+      } else {
+        throw new NoReceiveWalletError('payOutBolt11Replacement returned more msats than the original')
+      }
+    }
+  } catch (e) {
+    console.error('payOutBolt11Replacement failed', e)
+    if (!(e instanceof NoReceiveWalletError)) {
+      throw e
+    }
+    // if we can no longer produce a payOutBolt11, we fallback to custodial tokens
+    payInFailed.payOutCustodialTokens.push(payOutCustodialTokenFromBolt11(payInFailed.payOutBolt11))
+    // convert the routing fee to another rewards pool output
+    const routingFee = payInFailed.payOutCustodialTokens.find(t => t.payOutType === 'ROUTING_FEE')
+    if (routingFee) {
+      routingFee.payOutType = 'REWARDS_POOL'
+      routingFee.userId = USER_ID.rewards
+    }
+    payInFailed.payOutBolt11 = null
+  }
+  return payInFailed
+}
