GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-13 12:33:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #998 from starius/loopin-skip-unnecessary-timeout-tx

Browse source 
loopin: no timeout tx if invoice was paid
This commit is contained in:
Boris Nagaev 2025-08-27 10:58:06 -03:00 • committed by GitHub
commit ae22323734
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
loopin.go
View file

@ -854,9 +854,11 @@ func getTxFee(tx *wire.MsgTx, fee chainfee.SatPerKVByte) btcutil.Amount {
return fee.FeeForVSize(lntypes.VByte(vsize))
}
// waitForSwapComplete waits until a spending tx of the htlc gets confirmed and
// the swap invoice is either settled or canceled. If the htlc times out, the
// timeout tx will be published.
// waitForSwapComplete waits until a spending tx of the HTLC gets confirmed and
// the swap invoice is either settled or canceled. If the HTLC times out and the
// invoice is still not paid, the timeout tx will be published. If the HTLC
// times out and the invoice is paid, the function stops waiting and returns
// clearly.
func (s *loopInSwap) waitForSwapComplete(ctx context.Context,
htlcOutpoint *wire.OutPoint, htlcValue btcutil.Amount) error {
@ -882,8 +884,18 @@ func (s *loopInSwap) waitForSwapComplete(ctx context.Context,
}
// publishTxOnTimeout publishes the timeout tx if the contract has
// expired.
// expired and invoice has not been settled.
publishTxOnTimeout := func() (btcutil.Amount, error) {
// Don't publish the timeout tx if the invoice was settled.
if s.state == loopdb.StateInvoiceSettled {
return 0, nil
}
// Don't publish the timeout tx if the swap succeeded.
if s.state == loopdb.StateSuccess {
return 0, nil
}
if s.height >= s.LoopInContract.CltvExpiry {
return s.publishTimeoutTx(ctx, htlcOutpoint, htlcValue)
}
@ -902,7 +914,18 @@ func (s *loopInSwap) waitForSwapComplete(ctx context.Context,
htlcSpend := false
invoiceFinalized := false
htlcKeyRevealed := false
for !htlcSpend || !invoiceFinalized {
for {
// Check stop conditions.
if htlcSpend && invoiceFinalized {
break
}
if s.state == loopdb.StateInvoiceSettled {
if s.height >= s.LoopInContract.CltvExpiry {
s.setState(loopdb.StateSuccess)
break
}
}
select {
// If the client requested the swap to be abandoned, we override
// the status in the database.