mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-13 19:16:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9597 from guggero/rebase-fix

Browse source 
contractcourt: fix rebase issue with removed variadic option
This commit is contained in:
Oliver Gugger 2025-03-10 15:46:51 -06:00 • committed by GitHub
commit 97bba57520
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contractcourt/commit_sweep_resolver.go
View file

@ -413,17 +413,22 @@ func (c *commitSweepResolver) Launch() error {
&c.commitResolution.SelfOutPoint, witnessType,
&c.commitResolution.SelfOutputSignDesc,
c.broadcastHeight, c.commitResolution.MaturityDelay,
c.leaseExpiry,
c.leaseExpiry, input.WithResolutionBlob(
c.commitResolution.ResolutionBlob,
),
)
} else {
inp = input.NewCsvInput(
&c.commitResolution.SelfOutPoint, witnessType,
&c.commitResolution.SelfOutputSignDesc,
c.broadcastHeight, c.commitResolution.MaturityDelay,
input.WithResolutionBlob(
c.commitResolution.ResolutionBlob,
),
)
}
// TODO(roasbeef): instead of ading ctrl block to the sign desc, make
// TODO(roasbeef): instead of adding ctrl block to the sign desc, make
// new input type, have sweeper set it?
// Calculate the budget for the sweeping this input.

6
contractcourt/htlc_lease_resolver.go
View file

@ -58,10 +58,8 @@ func (h *htlcLeaseResolver) makeSweepInput(op *wire.OutPoint,
if h.hasCLTV() {
return input.NewCsvInputWithCltv(
op, cltvWtype, signDesc,
broadcastHeight, csvDelay,
h.leaseExpiry,
input.WithResolutionBlob(resBlob),
op, cltvWtype, signDesc, broadcastHeight, csvDelay,
h.leaseExpiry, input.WithResolutionBlob(resBlob),
)
}