fix not counting final cltv delta

huumn · huumn · commit 484b41352fd5 · 2025-12-12T19:19:18.000-06:00
diff --git a/api/lnd/index.js b/api/lnd/index.js
@@ -69,8 +69,7 @@ export async function estimateRouteFeeProbe ({ lnd, request, maxFeeMsat, timeout
     const { htlcs: [{ route: { total_fees_msat: routingFeeMsat, total_time_lock: timeLockDelay } }] } = probe
     return {
       routingFeeMsat: toPositiveNumber(routingFeeMsat),
-      // because we are simulating estimateRouteFee's probe, we remove the final hop's cltv_delta
-      timeLockDelay: toPositiveNumber(timeLockDelay - inv.cltv_delta)
+      timeLockDelay: toPositiveNumber(timeLockDelay)
     }
   }
 
diff --git a/wallets/server/wrap.js b/wallets/server/wrap.js
@@ -10,10 +10,6 @@ const INCOMING_EXPIRATION_BUFFER_MSECS = 120_000 // the buffer enforce for the i
 const MAX_OUTGOING_CLTV_DELTA = 1000 // the maximum cltv delta we'll allow for the outgoing invoice
 export const MIN_SETTLEMENT_CLTV_DELTA = 80 // the minimum blocks we'll leave for settling the incoming invoice
 const FEE_ESTIMATE_TIMEOUT_SECS = 5 // the timeout for the fee estimate request
-// the buffer in case we underestimated the cltv delta with our probe
-// also ln-service enforces a 3 block buffer ontop of the final hop's cltv delta
-// preventing outgoing cltv limits that may be exact from being sent
-const CLTV_DELTA_BUFFER = 10
 
 /*
   The wrapInvoice function is used to wrap an outgoing invoice with the necessary parameters for an incoming hold invoice.
@@ -169,7 +165,7 @@ async function wrapBolt11Params ({ msats, bolt11, maxRoutingFeeMsats, hideInvoic
     */
     wrapped.cltv_delta = toPositiveNumber(
       toPositiveNumber(timeLockDelay) + toPositiveNumber(inv.cltv_delta) -
-      toPositiveNumber(blockHeight) + MIN_SETTLEMENT_CLTV_DELTA + CLTV_DELTA_BUFFER)
+      toPositiveNumber(blockHeight) + MIN_SETTLEMENT_CLTV_DELTA)
     console.log('routingFeeMsat', routingFeeMsat, 'wrapped cltv_delta', wrapped.cltv_delta,
       'timeLockDelay', timeLockDelay, 'inv.cltv_delta', inv.cltv_delta, 'blockHeight', blockHeight)
 

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ export async function estimateRouteFeeProbe ({ lnd, request, maxFeeMsat, timeout`
`69`	`69`	`const { htlcs: [{ route: { total_fees_msat: routingFeeMsat, total_time_lock: timeLockDelay } }] } = probe`
`70`	`70`	`return {`
`71`	`71`	`routingFeeMsat: toPositiveNumber(routingFeeMsat),`
`72`		`- // because we are simulating estimateRouteFee's probe, we remove the final hop's cltv_delta`
`73`		`- timeLockDelay: toPositiveNumber(timeLockDelay - inv.cltv_delta)`
	`72`	`+ timeLockDelay: toPositiveNumber(timeLockDelay)`
`74`	`73`	`}`
`75`	`74`	`}`
`76`	`75`