akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chancloser: express fee rates in sat/vbyte

Browse Source
This commit is contained in:
Johan T. Halseth 2018-02-13 15:01:24 +01:00
parent 6d5c0679f4
commit 3e12f823b2
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chancloser.go
View File

@ -150,7 +150,7 @@ type channelCloser struct {
// passed configuration, and delivery+fee preference. The final argument should // passed configuration, and delivery+fee preference. The final argument should
// only be populated iff, we're the initiator of this closing request. // only be populated iff, we're the initiator of this closing request.
func newChannelCloser(cfg chanCloseCfg, deliveryScript []byte, func newChannelCloser(cfg chanCloseCfg, deliveryScript []byte,
idealFeePerkw btcutil.Amount, negotiationHeight uint32, idealFeePerKw lnwallet.SatPerKWeight, negotiationHeight uint32,
closeReq *htlcswitch.ChanClose, closeReq *htlcswitch.ChanClose,
closeCtx *contractcourt.CooperativeCloseCtx) *channelCloser { closeCtx *contractcourt.CooperativeCloseCtx) *channelCloser {
@ -158,9 +158,7 @@ func newChannelCloser(cfg chanCloseCfg, deliveryScript []byte,
// fee will be starting at for this fee negotiation. // fee will be starting at for this fee negotiation.
// //
// TODO(roasbeef): should factor in minimal commit // TODO(roasbeef): should factor in minimal commit
idealFeeSat := btcutil.Amount( idealFeeSat := cfg.channel.CalcFee(idealFeePerKw)
cfg.channel.CalcFee(uint64(idealFeePerkw)),
)
// If this fee is greater than the fee currently present within the // If this fee is greater than the fee currently present within the
// commitment transaction, then we'll clamp it down to be within the // commitment transaction, then we'll clamp it down to be within the