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

loopout: add asset accounting

Browse source
This commit is contained in:
sputn1ck 2025-01-20 09:16:07 +01:00
parent dfa58d4906
commit 3e3c863819
No known key found for this signature in database
GPG key ID: 671103D881A5F0E4
6 changed files with 920 additions and 682 deletions
Download patch file Download diff file Expand all files Collapse all files

56
loopout.go
View file

@ -4,6 +4,7 @@ import (
"context"
"crypto/rand"
"crypto/sha256"
"encoding/json"
"errors"
"fmt"
"math"
@ -355,6 +356,10 @@ func (s *loopOutSwap) sendUpdate(ctx context.Context) error {
info.OutgoingChanSet = outgoingChanSet
}
if s.isAssetSwap() {
info.AssetSwapInfo = s.AssetSwapInfo
}
select {
case s.statusChan <- *info:
case <-ctx.Done():
@ -436,7 +441,7 @@ func (s *loopOutSwap) executeAndFinalize(globalCtx context.Context) error {
case result := <-s.swapPaymentChan:
s.swapPaymentChan = nil
err := s.handlePaymentResult(result, true)
err := s.handlePaymentResult(globalCtx, result, true)
if err != nil {
return err
}
@ -452,7 +457,7 @@ func (s *loopOutSwap) executeAndFinalize(globalCtx context.Context) error {
case result := <-s.prePaymentChan:
s.prePaymentChan = nil
err := s.handlePaymentResult(result, false)
err := s.handlePaymentResult(globalCtx, result, false)
if err != nil {
return err
}
@ -485,8 +490,8 @@ func (s *loopOutSwap) executeAndFinalize(globalCtx context.Context) error {
// handlePaymentResult processes the result of a payment attempt. If the
// payment was successful and this is the main swap payment, the cost of the
// swap is updated.
func (s *loopOutSwap) handlePaymentResult(result paymentResult,
swapPayment bool) error {
func (s *loopOutSwap) handlePaymentResult(ctx context.Context,
result paymentResult, swapPayment bool) error {
switch {
// If our result has a non-nil error, our status will be nil. In this
@ -513,6 +518,17 @@ func (s *loopOutSwap) handlePaymentResult(result paymentResult,
// the swap payment and the prepay.
s.cost.Offchain += result.status.Fee.ToSatoshis()
// If this is an asset payment, we'll write the asset amounts
// to the swap.
if s.isAssetSwap() {
err := s.fillAssetOffchainPaymentResult(
ctx, result, swapPayment,
)
if err != nil {
return err
}
}
return nil
case result.status.State == lnrpc.Payment_FAILED:
@ -1035,7 +1051,7 @@ func (s *loopOutSwap) waitForConfirmedHtlc(globalCtx context.Context) (
case result := <-s.swapPaymentChan:
s.swapPaymentChan = nil
err := s.handlePaymentResult(result, true)
err := s.handlePaymentResult(ctx, result, true)
if err != nil {
return nil, err
}
@ -1057,7 +1073,7 @@ func (s *loopOutSwap) waitForConfirmedHtlc(globalCtx context.Context) (
case result := <-s.prePaymentChan:
s.prePaymentChan = nil
err := s.handlePaymentResult(result, false)
err := s.handlePaymentResult(ctx, result, false)
if err != nil {
return nil, err
}
@ -1458,6 +1474,34 @@ func (s *loopOutSwap) canSweep() bool {
return true
}
func (s *loopOutSwap) fillAssetOffchainPaymentResult(ctx context.Context,
result paymentResult, isSwapPayment bool) error {
if len(result.status.Htlcs) == 0 {
return fmt.Errorf("no htlcs in payment result")
}
// We only expect one htlc in the result.
htlc := result.status.Htlcs[0]
var assetData rfqmsg.JsonHtlc
err := json.Unmarshal(htlc.Route.CustomChannelData, &assetData)
if err != nil {
return err
}
assetSendAmt := assetData.Balances[0].Amount
if isSwapPayment {
s.AssetSwapInfo.SwapPaidAmt = assetSendAmt
log.Debugf("Asset off-chain payment success: %v", assetSendAmt)
} else {
s.AssetSwapInfo.PrepayPaidAmt = assetSendAmt
}
return s.store.UpdateLoopOutAssetInfo(ctx, s.hash, s.AssetSwapInfo)
}
// isAssetSwap returns true if the swap is an asset swap.
func (s *loopOutSwap) isAssetSwap() bool {
return s.AssetSwapInfo != nil