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

Revert "Merge pull request #1028 from starius/downgrade-deps"

Browse source 
This reverts commit b11c959bc8, reversing
changes made to 0a182ee308.
This commit is contained in:
sputn1ck 2025-10-31 18:48:26 +01:00
parent 2b41fe2c7c
commit e4f64ec9cc
No known key found for this signature in database
GPG key ID: 671103D881A5F0E4
15 changed files with 317 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
loopout.go
View file

@ -25,9 +25,9 @@ import (
"github.com/lightninglabs/taproot-assets/fn"
"github.com/lightninglabs/taproot-assets/rfqmsg"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/channeldb"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntypes"
paymentsdb "github.com/lightningnetwork/lnd/payments/db"
"github.com/lightningnetwork/lnd/tlv"
"google.golang.org/grpc"
)
@ -843,7 +843,17 @@ func (s *loopOutSwap) payInvoiceAsync(ctx context.Context,
return nil, fmt.Errorf("rfq id has wrong length: %v", n)
}
htlc := rfqmsg.NewHtlc(nil, fn.Some(rfq))
// In order to still be compatible with the old wire format for
// asset HTLCs, we populate both fields.
//
// Older versions of tapd will ignore the new field and only use
// the old one.
//
// Newer versions will ignore the old field and only use the new
// field.
htlc := rfqmsg.NewHtlc(
nil, fn.Some(rfq), fn.Some([]rfqmsg.ID{rfq}),
)
htlcMapRecords, err := tlv.RecordsToMap(htlc.Records())
if err != nil {
return nil, err
@ -960,7 +970,7 @@ func (s *loopOutSwap) awaitSendPayment(ctx context.Context, hash lntypes.Hash,
// payment error from TrackPayment is no longer expected
// here.
case err := <-payErrChan:
if err != channeldb.ErrAlreadyPaid {
if err != paymentsdb.ErrAlreadyPaid {
return nil, err
}