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

loopd: refactor blocks-until-expiry calculation

Browse source
This commit is contained in:
Slyghtning 2025-10-09 09:14:43 +02:00
parent 0d3a4c8a19
commit de2964efba
No known key found for this signature in database
GPG key ID: F82D456EA023C9BF
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
loopd/swapclient_server.go
View file

@ -1788,20 +1788,9 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
}
// Calculate the blocks until expiry for each deposit.
lndInfo, err := s.lnd.Client.GetInfo(ctx)
err = s.populateBlocksUntilExpiry(ctx, filteredDeposits)
if err != nil {
return nil, err
}
bestBlockHeight := int64(lndInfo.BlockHeight)
params, err := s.staticAddressManager.GetStaticAddressParameters(ctx)
if err != nil {
return nil, err
}
for i := 0; i < len(filteredDeposits); i++ {
filteredDeposits[i].BlocksUntilExpiry =
filteredDeposits[i].ConfirmationHeight +
int64(params.Expiry) - bestBlockHeight
infof("Failed to populate blocks until expiry: %v", err)
}
return &looprpc.ListStaticAddressDepositsResponse{
@ -2083,6 +2072,11 @@ func (s *swapClientServer) StaticAddressLoopIn(ctx context.Context,
loopIn.Deposits, func(d *deposit.Deposit) bool { return true },
)
err = s.populateBlocksUntilExpiry(ctx, usedDeposits)
if err != nil {
infof("Failed to populate blocks until expiry: %v", err)
}
// Determine the actual swap amount and change based on the selected
// amount and the total value of the selected deposits.
total := loopIn.TotalDepositAmount()
@ -2117,6 +2111,29 @@ func (s *swapClientServer) StaticAddressLoopIn(ctx context.Context,
}, nil
}
// Calculate the blocks until expiry for each deposit and return the modified
// StaticAddressLoopInResponse.
func (s *swapClientServer) populateBlocksUntilExpiry(ctx context.Context,
deposits []*looprpc.Deposit) error {
lndInfo, err := s.lnd.Client.GetInfo(ctx)
if err != nil {
return err
}
bestBlockHeight := int64(lndInfo.BlockHeight)
params, err := s.staticAddressManager.GetStaticAddressParameters(ctx)
if err != nil {
return err
}
for i := 0; i < len(deposits); i++ {
deposits[i].BlocksUntilExpiry =
deposits[i].ConfirmationHeight +
int64(params.Expiry) - bestBlockHeight
}
return nil
}
type filterFunc func(deposits *deposit.Deposit) bool
func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {