Merge pull request #1725 from wpaulino/manual-fee-floor

rpcserver: enforce fee floor for fee rates input by the user
This commit is contained in:
Olaoluwa Osuntokun 2018-08-13 21:03:37 -07:00 committed by GitHub
commit 35363ee9a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -434,8 +434,14 @@ func determineFeePerKw(feeEstimator lnwallet.FeeEstimator, targetConf int32,
// If a manual sat/byte fee rate is set, then we'll use that directly. // If a manual sat/byte fee rate is set, then we'll use that directly.
// We'll need to convert it to sat/kw as this is what we use internally. // We'll need to convert it to sat/kw as this is what we use internally.
case feePerByte != 0: case feePerByte != 0:
feePerKB := lnwallet.SatPerKVByte(feePerByte * 1000) feePerKW := lnwallet.SatPerKVByte(feePerByte * 1000).FeePerKWeight()
return feePerKB.FeePerKWeight(), nil if feePerKW < lnwallet.FeePerKwFloor {
rpcsLog.Infof("Manual fee rate input of %d sat/kw is "+
"too low, using %d sat/kw instead", feePerKW,
lnwallet.FeePerKwFloor)
feePerKW = lnwallet.FeePerKwFloor
}
return feePerKW, nil
// Otherwise, we'll attempt a relaxed confirmation target for the // Otherwise, we'll attempt a relaxed confirmation target for the
// transaction // transaction