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

Take into account that the new fee will not come in addition to old fee when updating commit fee

Browse Source
This commit is contained in:
Vegard Engen 2018-04-29 11:36:59 +00:00
parent 09c9979831
commit d7a254328e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lnwallet/channel.go
View File

@ -5583,6 +5583,7 @@ func (lc *LightningChannel) validateFeeRate(feePerKw SatPerKWeight) error {
// be above our reserve balance. Otherwise, we'll reject the fee // be above our reserve balance. Otherwise, we'll reject the fee
// update. // update.
availableBalance, txWeight := lc.availableBalance() availableBalance, txWeight := lc.availableBalance()
oldFee := lnwire.NewMSatFromSatoshis(lc.CalcFee(SatPerKWeight(lc.channelState.LocalCommitment.FeePerKw)))
// Using the weight of the commitment transaction if we were to create // Using the weight of the commitment transaction if we were to create
// a commitment now, we'll compute our remaining balance if we apply // a commitment now, we'll compute our remaining balance if we apply
@ -5593,20 +5594,20 @@ func (lc *LightningChannel) validateFeeRate(feePerKw SatPerKWeight) error {
// If the total fee exceeds our available balance, then we'll reject // If the total fee exceeds our available balance, then we'll reject
// this update as it would mean we need to trim our entire output. // this update as it would mean we need to trim our entire output.
if newFee > availableBalance { if newFee > availableBalance+oldFee {
return fmt.Errorf("cannot apply fee_update=%v sat/kw, new fee "+ return fmt.Errorf("cannot apply fee_update=%v sat/kw, new fee "+
"of %v is greater than balance of %v", int64(feePerKw), "of %v is greater than balance of %v", int64(feePerKw),
newFee, availableBalance) newFee, availableBalance+oldFee)
} }
// If this new balance is below our reserve, then we can't accommodate // If this new balance is below our reserve, then we can't accommodate
// the fee change, so we'll reject it. // the fee change, so we'll reject it.
balanceAfterFee := availableBalance - newFee balanceAfterFee := availableBalance + oldFee - newFee
if balanceAfterFee.ToSatoshis() < lc.channelState.LocalChanCfg.ChanReserve { if balanceAfterFee.ToSatoshis() < lc.channelState.LocalChanCfg.ChanReserve {
return fmt.Errorf("cannot apply fee_update=%v sat/kw, "+ return fmt.Errorf("cannot apply fee_update=%v sat/kw, "+
"insufficient balance: start=%v, end=%v", "new balance=%v would dip below channel reserve=%v",
int64(feePerKw), int64(feePerKw),
availableBalance, balanceAfterFee) balanceAfterFee.ToSatoshis(), lc.channelState.LocalChanCfg.ChanReserve)
} }
// TODO(halseth): should fail if fee update is unreasonable, // TODO(halseth): should fail if fee update is unreasonable,