Skip to content

WIP: make sweeper deadline aware #7549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yyforyongyu wants to merge 3 commits into from
Closed

WIP: make sweeper deadline aware #7549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa1acb8
sweep: introduce feeBumper to perform fee bumping
yyforyongyu Mar 30, 2023
7e8043e
sweep: add strategy to linearly increase fee rate
yyforyongyu Mar 31, 2023
1308f3a
contractcourt: use StrategyLinear to sweep timeout htlc
yyforyongyu Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions contractcourt/htlc_timeout_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ import (
"github.com/lightningnetwork/lnd/sweep"
)

const (
// DefaultMaxFeeRatio specidfies the default maximum ratio between the
// max fee allowed and the input's amount.
//
// TODO(yy): too aggressive? And make it configurable.
DefaultMaxFeeRatio = 0.2
)

// htlcTimeoutResolver is a ContractResolver that's capable of resolving an
// outgoing HTLC. The HTLC may be on our commitment transaction, or on the
// commitment transaction of the remote party. An output on our commitment
Expand Down Expand Up @@ -335,8 +343,12 @@ func (h *htlcTimeoutResolver) spendHtlcOutput() (*chainntnfs.SpendDetail, error)
&inp,
sweep.Params{
Fee: sweep.FeePreference{
// TODO(yy): Need to get the conf
// target from the incoming htlc.
ConfTarget: secondLevelConfTarget,
},
Strategy: sweep.StrategyLinear,
MaxFeeRatio: DefaultMaxFeeRatio,
},
)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ func SetupLoggers(root *build.RotatingLogWriter, interceptor signal.Interceptor)
AddSubLogger(root, "BRAR", interceptor, contractcourt.UseBreachLogger)
AddSubLogger(root, "SPHX", interceptor, sphinx.UseLogger)
AddSubLogger(root, "SWPR", interceptor, sweep.UseLogger)
AddSubLogger(root, "FBMP", interceptor, sweep.UseBumperLogger)
AddSubLogger(root, "SGNR", interceptor, signrpc.UseLogger)
AddSubLogger(root, "WLKT", interceptor, walletrpc.UseLogger)
AddSubLogger(root, "ARPC", interceptor, autopilotrpc.UseLogger)
Expand Down
6 changes: 5 additions & 1 deletion server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
return nil, err
}

s.sweeper = sweep.New(&sweep.UtxoSweeperConfig{
s.sweeper, err = sweep.New(&sweep.UtxoSweeperConfig{
FeeEstimator: cc.FeeEstimator,
GenSweepScript: newSweepPkScriptGen(cc.Wallet),
Signer: cc.Wallet.Cfg.Signer,
Expand All @@ -1068,6 +1068,10 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
MaxFeeRate: sweep.DefaultMaxFeeRate,
FeeRateBucketSize: sweep.DefaultFeeRateBucketSize,
})
if err != nil {
srvrLog.Errorf("unable to create sweeper: %v", err)
return nil, err
}

s.utxoNursery = contractcourt.NewUtxoNursery(&contractcourt.NurseryConfig{
ChainIO: cc.ChainIO,
Expand Down
Loading