Skip to content
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.

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

Already on GitHub? Sign in to your account

sweep+lnrpc: enforce provided fee rate is no less than relay fee #7645

Merged
merged 4 commits into from
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/release-notes/release-notes-0.17.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ package](https://github.com/lightningnetwork/lnd/pull/7356)
* [SendOutputs](https://github.com/lightningnetwork/lnd/pull/7631) now adheres
to the anchor channel reserve requirement.

* Enforce provided [fee rate is no less than the relay or minimum mempool
yyforyongyu marked this conversation as resolved.
Show resolved Hide resolved
fee](https://github.com/lightningnetwork/lnd/pull/7645) when calling
guggero marked this conversation as resolved.
Show resolved Hide resolved
`OpenChannel`, `CloseChannel`, `SendCoins`, and `SendMany`.

* The [UpdateNodeAnnouncement](https://github.com/lightningnetwork/lnd/pull/7568)
API can no longer be used to set/unset protocol features that are defined by
LND.
Expand Down Expand Up @@ -76,4 +80,5 @@ unlock or create.
* Matt Morehouse
* Michael Street
* Oliver Gugger
* Shaurya Arora
* ziggie1984
41 changes: 41 additions & 0 deletions lnrpc/rpc_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ package lnrpc
import (
"encoding/hex"
"errors"
"fmt"
"sort"

"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
"github.com/lightningnetwork/lnd/sweep"
"google.golang.org/protobuf/encoding/protojson"
)

Expand Down Expand Up @@ -193,3 +196,41 @@ func GetChanPointFundingTxid(chanPoint *ChannelPoint) (*chainhash.Hash, error) {

return chainhash.NewHash(txid)
}

// CalculateFeeRate uses either satPerByte or satPerVByte, but not both, from a
yyforyongyu marked this conversation as resolved.
Show resolved Hide resolved
// request to calculate the fee rate. It provides compatibility for the
// deprecated field, satPerByte. Once the field is safe to be removed, the
// check can then be deleted.
func CalculateFeeRate(satPerByte, satPerVByte uint64, targetConf uint32,
estimator chainfee.Estimator) (chainfee.SatPerKWeight, error) {

var feeRate chainfee.SatPerKWeight

// We only allow using either the deprecated field or the new field.
if satPerByte != 0 && satPerVByte != 0 {
return feeRate, fmt.Errorf("either SatPerByte or " +
"SatPerVByte should be set, but not both")
}

// Default to satPerVByte, and overwrite it if satPerByte is set.
satPerKw := chainfee.SatPerKVByte(satPerVByte * 1000).FeePerKWeight()
if satPerByte != 0 {
satPerKw = chainfee.SatPerKVByte(
satPerByte * 1000,
).FeePerKWeight()
}

// Based on the passed fee related parameters, we'll determine an
// appropriate fee rate for this transaction.
feeRate, err := sweep.DetermineFeePerKw(
estimator, sweep.FeePreference{
ConfTarget: targetConf,
FeeRate: satPerKw,
},
)
if err != nil {
return feeRate, err
}

return feeRate, nil
}
46 changes: 4 additions & 42 deletions rpcserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,44 +222,6 @@ func stringInSlice(a string, slice []string) bool {
return false
}

// calculateFeeRate uses either satPerByte or satPerVByte, but not both, from a
// request to calculate the fee rate. It provides compatibility for the
// deprecated field, satPerByte. Once the field is safe to be removed, the
// check can then be deleted.
func calculateFeeRate(satPerByte, satPerVByte uint64, targetConf uint32,
estimator chainfee.Estimator) (chainfee.SatPerKWeight, error) {

var feeRate chainfee.SatPerKWeight

// We only allow using either the deprecated field or the new field.
if satPerByte != 0 && satPerVByte != 0 {
return feeRate, fmt.Errorf("either SatPerByte or " +
"SatPerVByte should be set, but not both")
}

// Default to satPerVByte, and overwrite it if satPerByte is set.
satPerKw := chainfee.SatPerKVByte(satPerVByte * 1000).FeePerKWeight()
if satPerByte != 0 {
satPerKw = chainfee.SatPerKVByte(
satPerByte * 1000,
).FeePerKWeight()
}

// Based on the passed fee related parameters, we'll determine an
// appropriate fee rate for this transaction.
feeRate, err := sweep.DetermineFeePerKw(
estimator, sweep.FeePreference{
ConfTarget: targetConf,
FeeRate: satPerKw,
},
)
if err != nil {
return feeRate, err
}

return feeRate, nil
}

// GetAllPermissions returns all the permissions required to interact with lnd.
func GetAllPermissions() []bakery.Op {
allPerms := make([]bakery.Op, 0)
Expand Down Expand Up @@ -1239,7 +1201,7 @@ func (r *rpcServer) SendCoins(ctx context.Context,
in *lnrpc.SendCoinsRequest) (*lnrpc.SendCoinsResponse, error) {

// Calculate an appropriate fee rate for this transaction.
feePerKw, err := calculateFeeRate(
feePerKw, err := lnrpc.CalculateFeeRate(
uint64(in.SatPerByte), in.SatPerVbyte, // nolint:staticcheck
uint32(in.TargetConf), r.server.cc.FeeEstimator,
)
Expand Down Expand Up @@ -1452,7 +1414,7 @@ func (r *rpcServer) SendMany(ctx context.Context,
in *lnrpc.SendManyRequest) (*lnrpc.SendManyResponse, error) {

// Calculate an appropriate fee rate for this transaction.
feePerKw, err := calculateFeeRate(
feePerKw, err := lnrpc.CalculateFeeRate(
uint64(in.SatPerByte), in.SatPerVbyte, // nolint:staticcheck
uint32(in.TargetConf), r.server.cc.FeeEstimator,
)
Expand Down Expand Up @@ -2093,7 +2055,7 @@ func (r *rpcServer) parseOpenChannelReq(in *lnrpc.OpenChannelRequest,
}

// Calculate an appropriate fee rate for this transaction.
feeRate, err := calculateFeeRate(
feeRate, err := lnrpc.CalculateFeeRate(
uint64(in.SatPerByte), in.SatPerVbyte, // nolint:staticcheck
uint32(in.TargetConf), r.server.cc.FeeEstimator,
)
Expand Down Expand Up @@ -2574,7 +2536,7 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
// Based on the passed fee related parameters, we'll determine
// an appropriate fee rate for the cooperative closure
// transaction.
feeRate, err := calculateFeeRate(
feeRate, err := lnrpc.CalculateFeeRate(
uint64(in.SatPerByte), in.SatPerVbyte, // nolint:staticcheck
uint32(in.TargetConf), r.server.cc.FeeEstimator,
)
Expand Down
19 changes: 17 additions & 2 deletions sweep/walletsweep.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,29 @@ func DetermineFeePerKw(feeEstimator chainfee.Estimator,
// internally.
case feePref.FeeRate != 0:
feePerKW := feePref.FeeRate
if feePerKW < chainfee.FeePerKwFloor {

// Because the user can specify 1 sat/vByte on the RPC
// interface, which corresponds to 250 sat/kw, we need to bump
// that to the minimum "safe" fee rate which is 253 sat/kw.
if feePerKW == chainfee.AbsoluteFeePerKwFloor {
guggero marked this conversation as resolved.
Show resolved Hide resolved
log.Infof("Manual fee rate input of %d sat/kw is "+
"too low, using %d sat/kw instead", feePerKW,
chainfee.FeePerKwFloor)

feePerKW = chainfee.FeePerKwFloor
}

// If that bumped fee rate of at least 253 sat/kw is still lower
// than the relay fee rate, we return an error to let the user
// know. Note that "Relay fee rate" may mean slightly different
// things depending on the backend. For bitcoind, it is
// effectively max(relay fee, min mempool fee).
minFeePerKW := feeEstimator.RelayFeePerKW()
if feePerKW < minFeePerKW {
return 0, fmt.Errorf("manual fee rate input of %d "+
"sat/kw is too low to be accepted into the "+
"mempool or relayed to the network", feePerKW)
}

return feePerKW, nil

// Otherwise, we'll attempt a relaxed confirmation target for the
Expand Down
12 changes: 10 additions & 2 deletions sweep/walletsweep_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,20 @@ func TestDetermineFeePerKw(t *testing.T) {
// fail determines if this test case should fail or not.
fail bool
}{
// A fee rate below the fee rate floor should output the floor.
// A fee rate below the floor should error out.
{
feePref: FeePreference{
FeeRate: chainfee.SatPerKWeight(99),
},
fee: chainfee.FeePerKwFloor,
fail: true,
},

// A fee rate below the relay fee should error out.
{
feePref: FeePreference{
FeeRate: chainfee.SatPerKWeight(299),
},
fail: true,
},

// A fee rate above the floor, should pass through and return
Expand Down