mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-24 06:47:44 +01:00
Code Issues Projects Releases Wiki Activity

sweep: add method isMature on SweeperInput

Browse source 
Also updated `handlePendingSweepsReq` to skip immature inputs so the
returned results are the same as those in pre-0.18.0.
This commit is contained in:
yyforyongyu 2024-04-30 19:28:01 +08:00 • committed by yyforyongyu
parent ba238962d6
commit afc08c6623
No known key found for this signature in database
GPG key ID: 9BCD95C4FF296868
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
sweep/sweeper.go
View file

@ -222,6 +222,34 @@ func (p *SweeperInput) terminated() bool {
}
}
// isMature returns a boolean indicating whether the input has a timelock that
// has been reached or not. The locktime found is also returned.
func (p *SweeperInput) isMature(currentHeight uint32) (bool, uint32) {
locktime, _ := p.RequiredLockTime()
if currentHeight < locktime {
log.Debugf("Input %v has locktime=%v, current height is %v",
p.OutPoint(), locktime, currentHeight)
return false, locktime
}
// If the input has a CSV that's not yet reached, we will skip
// this input and wait for the expiry.
//
// NOTE: We need to consider whether this input can be included in the
// next block or not, which means the CSV will be checked against the
// currentHeight plus one.
locktime = p.BlocksToMaturity() + p.HeightHint()
if currentHeight+1 < locktime {
log.Debugf("Input %v has CSV expiry=%v, current height is %v",
p.OutPoint(), locktime, currentHeight)
return false, locktime
}
return true, locktime
}
// InputsMap is a type alias for a set of pending inputs.
type InputsMap = map[wire.OutPoint]*SweeperInput
@ -1038,6 +1066,12 @@ func (s *UtxoSweeper) handlePendingSweepsReq(
resps := make(map[wire.OutPoint]*PendingInputResponse, len(s.inputs))
for _, inp := range s.inputs {
// Skip immature inputs for compatibility.
mature, _ := inp.isMature(uint32(s.currentHeight))
if !mature {
continue
}
// Only the exported fields are set, as we expect the response
// to only be consumed externally.
op := inp.OutPoint()
@ -1485,20 +1519,9 @@ func (s *UtxoSweeper) updateSweeperInputs() InputsMap {
// If the input has a locktime that's not yet reached, we will
// skip this input and wait for the locktime to be reached.
locktime, _ := input.RequiredLockTime()
if uint32(s.currentHeight) < locktime {
log.Warnf("Skipping input %v due to locktime=%v not "+
"reached, current height is %v", op, locktime,
s.currentHeight)
continue
}
// If the input has a CSV that's not yet reached, we will skip
// this input and wait for the expiry.
locktime = input.BlocksToMaturity() + input.HeightHint()
if s.currentHeight < int32(locktime)-1 {
log.Infof("Skipping input %v due to CSV expiry=%v not "+
mature, locktime := input.isMature(uint32(s.currentHeight))
if !mature {
log.Infof("Skipping input %v due to locktime=%v not "+
"reached, current height is %v", op, locktime,
s.currentHeight)

2
sweep/sweeper_test.go
View file

@ -443,6 +443,7 @@ func TestUpdateSweeperInputs(t *testing.T) {
// returned.
inp2.On("RequiredLockTime").Return(
uint32(s.currentHeight+1), true).Once()
inp2.On("OutPoint").Return(wire.OutPoint{Index: 2}).Maybe()
input7 := &SweeperInput{state: Init, Input: inp2}
// Mock the input to have a CSV expiry in the future so it will NOT be
@ -451,6 +452,7 @@ func TestUpdateSweeperInputs(t *testing.T) {
uint32(s.currentHeight), false).Once()
inp3.On("BlocksToMaturity").Return(uint32(2)).Once()
inp3.On("HeightHint").Return(uint32(s.currentHeight)).Once()
inp3.On("OutPoint").Return(wire.OutPoint{Index: 3}).Maybe()
input8 := &SweeperInput{state: Init, Input: inp3}
// Add the inputs to the sweeper. After the update, we should see the