lnwallet: denominate in fee rate types

lnwallet/reservation.go

@@ -135,9 +135,9 @@ type ChannelReservation struct {
 // used only internally by lnwallet. In order to concurrent safety, the
 // creation of all channel reservations should be carried out via the
 // lnwallet.InitChannelReservation interface.
-func NewChannelReservation(capacity, fundingAmt, commitFeePerKw btcutil.Amount,
+func NewChannelReservation(capacity, fundingAmt btcutil.Amount,
-	wallet *LightningWallet, id uint64, pushMSat lnwire.MilliSatoshi,
+	commitFeePerKw SatPerKWeight, wallet *LightningWallet,
-	chainHash *chainhash.Hash,
+	id uint64, pushMSat lnwire.MilliSatoshi, chainHash *chainhash.Hash,
 	flags lnwire.FundingFlag) (*ChannelReservation, error) {
 
 	var (
@@ -146,10 +146,7 @@ func NewChannelReservation(capacity, fundingAmt, commitFeePerKw btcutil.Amount,
 		initiator    bool
 	)
 
-	commitFee := btcutil.Amount(
+	commitFee := commitFeePerKw.FeeForWeight(CommitWeight)
-		(int64(commitFeePerKw) * CommitWeight) / 1000,
-	)
-
 	fundingMSat := lnwire.NewMSatFromSatoshis(fundingAmt)
 	capacityMSat := lnwire.NewMSatFromSatoshis(capacity)
 	feeMSat := lnwire.NewMSatFromSatoshis(commitFee)
@@ -229,13 +226,13 @@ func NewChannelReservation(capacity, fundingAmt, commitFeePerKw btcutil.Amount,
 			LocalCommitment: channeldb.ChannelCommitment{
 				LocalBalance:  ourBalance,
 				RemoteBalance: theirBalance,
-				FeePerKw:      commitFeePerKw,
+				FeePerKw:      btcutil.Amount(commitFeePerKw),
 				CommitFee:     commitFee,
 			},
 			RemoteCommitment: channeldb.ChannelCommitment{
 				LocalBalance:  ourBalance,
 				RemoteBalance: theirBalance,
-				FeePerKw:      commitFeePerKw,
+				FeePerKw:      btcutil.Amount(commitFeePerKw),
 				CommitFee:     commitFee,
 			},
 			Db: wallet.Cfg.Database,

lnwallet/wallet.go

@@ -97,11 +97,11 @@ type initFundingReserveMsg struct {
 	// of initial commitment transactions. In order to ensure timely
 	// confirmation, it is recommended that this fee should be generous,
 	// paying some multiple of the accepted base fee rate of the network.
-	commitFeePerKw btcutil.Amount
+	commitFeePerKw SatPerKWeight
 
-	// fundingFeePerWeight is the fee rate in satoshis per eight unit to
+	// fundingFeePerVSize is the fee rate in sat/vbyte to use for the
-	// use for the initial funding transaction.
+	// initial funding transaction.
-	fundingFeePerWeight btcutil.Amount
+	fundingFeePerVSize SatPerVByte
 
 	// pushMSat is the number of milli-satoshis that should be pushed over
 	// the responder as part of the initial channel creation.
@@ -450,7 +450,7 @@ out:
 // commitment transaction is valid.
 func (l *LightningWallet) InitChannelReservation(
 	capacity, ourFundAmt btcutil.Amount, pushMSat lnwire.MilliSatoshi,
-	commitFeePerKw, fundingFeePerWeight btcutil.Amount,
+	commitFeePerKw SatPerKWeight, fundingFeePerVSize SatPerVByte,
 	theirID *btcec.PublicKey, theirAddr net.Addr,
 	chainHash *chainhash.Hash, flags lnwire.FundingFlag) (*ChannelReservation, error) {
 
@@ -464,7 +464,7 @@ func (l *LightningWallet) InitChannelReservation(
 		fundingAmount:      ourFundAmt,
 		capacity:           capacity,
 		commitFeePerKw:     commitFeePerKw,
-		fundingFeePerWeight: fundingFeePerWeight,
+		fundingFeePerVSize: fundingFeePerVSize,
 		pushMSat:           pushMSat,
 		flags:              flags,
 		err:                errChan,
@@ -516,10 +516,10 @@ func (l *LightningWallet) handleFundingReserveRequest(req *initFundingReserveMsg
 	// don't need to perform any coin selection. Otherwise, attempt to
 	// obtain enough coins to meet the required funding amount.
 	if req.fundingAmount != 0 {
-		// Coin selection is done on the basis of sat-per-weight, we'll
+		// Coin selection is done on the basis of sat-per-vbyte, we'll
-		// use the passed sat/byte passed in to perform coin selection.
+		// use the passed sat/vbyte passed in to perform coin selection.
 		err := l.selectCoinsAndChange(
-			req.fundingFeePerWeight, req.fundingAmount,
+			req.fundingFeePerVSize, req.fundingAmount,
 			reservation.ourContribution,
 		)
 		if err != nil {
@@ -1284,7 +1284,7 @@ func (l *LightningWallet) handleSingleFunderSigs(req *addSingleFunderSigsMsg) {
 // within the passed contribution's inputs. If necessary, a change address will
 // also be generated.
 // TODO(roasbeef): remove hardcoded fees and req'd confs for outputs.
-func (l *LightningWallet) selectCoinsAndChange(feeRatePerWeight btcutil.Amount,
+func (l *LightningWallet) selectCoinsAndChange(feeRate SatPerVByte,
 	amt btcutil.Amount, contribution *ChannelContribution) error {
 
 	// We hold the coin select mutex while querying for outputs, and
@@ -1294,7 +1294,7 @@ func (l *LightningWallet) selectCoinsAndChange(feeRatePerWeight btcutil.Amount,
 	defer l.coinSelectMtx.Unlock()
 
 	walletLog.Infof("Performing funding tx coin selection using %v "+
-		"sat/weight as fee rate", int64(feeRatePerWeight))
+		"sat/vbyte as fee rate", int64(feeRate))
 
 	// Find all unlocked unspent witness outputs with greater than 1
 	// confirmation.
@@ -1307,7 +1307,7 @@ func (l *LightningWallet) selectCoinsAndChange(feeRatePerWeight btcutil.Amount,
 	// Perform coin selection over our available, unlocked unspent outputs
 	// in order to find enough coins to meet the funding amount
 	// requirements.
-	selectedCoins, changeAmt, err := coinSelect(feeRatePerWeight, amt, coins)
+	selectedCoins, changeAmt, err := coinSelect(feeRate, amt, coins)
 	if err != nil {
 		return err
 	}
@@ -1415,9 +1415,9 @@ func selectInputs(amt btcutil.Amount, coins []*Utxo) (btcutil.Amount, []*Utxo, e
 
 // coinSelect attempts to select a sufficient amount of coins, including a
 // change output to fund amt satoshis, adhering to the specified fee rate. The
-// specified fee rate should be expressed in sat/byte for coin selection to
+// specified fee rate should be expressed in sat/vbyte for coin selection to
 // function properly.
-func coinSelect(feeRatePerWeight, amt btcutil.Amount,
+func coinSelect(feeRate SatPerVByte, amt btcutil.Amount,
 	coins []*Utxo) ([]*Utxo, btcutil.Amount, error) {
 
 	amtNeeded := amt
@@ -1461,9 +1461,7 @@ func coinSelect(feeRatePerWeight, amt btcutil.Amount,
 		// amount isn't enough to pay fees, then increase the requested
 		// coin amount by the estimate required fee, performing another
 		// round of coin selection.
-		requiredFee := btcutil.Amount(
+		requiredFee := feeRate.FeeForVSize(int64(weightEstimate.VSize()))
-			uint64(weightEstimate.Weight()) * uint64(feeRatePerWeight),
-		)
 		if overShootAmt < requiredFee {
 			amtNeeded = amt + requiredFee
 			continue