switch from SatPerVbyte to SatPerKw fields in APIs

Use SatPerKw instead of SatPerVbyte in SendCoins, CloseChannel,
and walletrpc.BumpFee APIs.

Added new option WithSendCoinsFeerate for SendCoins and WithOpenChannelFeerate
for OpenChannel API specifying feerate in sats/kw.

Use new fields provided by lightningnetwork/lnd#10067

Author: starius

lightning_client.go

@@ -81,6 +81,13 @@ func WithRemoteMaxHtlc(maxHtlc uint32) OpenChannelOption {
 	}
 }
 
+// WithOpenChannelFeerate specifies feerate in sats/kw for OpenChannel request.
+func WithOpenChannelFeerate(satPerKw chainfee.SatPerKWeight) OpenChannelOption {
+	return func(r *lnrpc.OpenChannelRequest) {
+		r.SatPerKw = uint64(satPerKw)
+	}
+}
+
 // LightningClient exposes base lightning functionality.
 type LightningClient interface {
 	ServiceClient[lnrpc.LightningClient]
@@ -214,7 +221,8 @@ type LightningClient interface {
 	// upon success.
 	SendCoins(ctx context.Context, addr btcutil.Address,
 		amount btcutil.Amount, sendAll bool, confTarget int32,
-		satsPerVByte chainfee.SatPerVByte, label string) (string, error)
+		satsPerVByte chainfee.SatPerVByte, label string,
+		opts ...SendCoinsOption) (string, error)
 
 	// ChannelBalance returns a summary of our channel balances.
 	ChannelBalance(ctx context.Context) (*ChannelBalance, error)
@@ -3149,10 +3157,19 @@ func (p *ChannelClosedUpdate) CloseTxid() chainhash.Hash {
 // CloseChannelRequest.
 type CloseChannelOption func(r *lnrpc.CloseChannelRequest)
 
-// SatPerVbyte is an option for setting the fee rate of a CloseChannelRequest.
+// SatPerVbyte is an option for setting the fee rate of a CloseChannelRequest
+// specified in sats/vbyte.
 func SatPerVbyte(satPerVbyte chainfee.SatPerVByte) CloseChannelOption {
 	return func(r *lnrpc.CloseChannelRequest) {
-		r.SatPerVbyte = uint64(satPerVbyte)
+		r.SatPerKw = uint64(satPerVbyte.FeePerKWeight())
+	}
+}
+
+// SatPerKw is an option for setting the fee rate of a CloseChannelRequest
+// specified in sats/kw.
+func SatPerKw(satPerKw chainfee.SatPerKWeight) CloseChannelOption {
+	return func(r *lnrpc.CloseChannelRequest) {
+		r.SatPerKw = uint64(satPerKw)
 	}
 }
 
@@ -3164,6 +3181,9 @@ func MaxFeePerVbyte(maxFeePerVbyte chainfee.SatPerVByte) CloseChannelOption {
 	}
 }
 
+// TODO: MaxFeePerKw
+// See https://github.com/lightningnetwork/lnd/pull/10067/files#r2302906743
+
 // WithNoWait is an option for setting the NoWait flag on an
 // CloseChannelRequest.
 func WithNoWait() CloseChannelOption {
@@ -3591,26 +3611,43 @@ func (s *lightningClient) Connect(ctx context.Context, peer route.Vertex,
 	return err
 }
 
+// SendCoinsOption is an option used in SendCoins call.
+type SendCoinsOption func(*lnrpc.SendCoinsRequest)
+
+// WithSendCoinsFeerate specifies feerate in sats/kw for SendCoins request.
+// To use it pass satsPerVByte=0 and WithSendCoinsFeerate(desired_feerate) to
+// SendCoins.
+func WithSendCoinsFeerate(satPerKw chainfee.SatPerKWeight) SendCoinsOption {
+	return func(req *lnrpc.SendCoinsRequest) {
+		req.SatPerKw = uint64(satPerKw)
+	}
+}
+
 // SendCoins sends the passed amount of (or all) coins to the passed address.
 // Either amount or sendAll must be specified, while confTarget, satsPerVByte
 // are optional and may be set to zero in which case automatic conf target and
 // fee will be used. Returns the tx id upon success.
 func (s *lightningClient) SendCoins(ctx context.Context, addr btcutil.Address,
 	amount btcutil.Amount, sendAll bool, confTarget int32,
-	satsPerVByte chainfee.SatPerVByte, label string) (string, error) {
+	satsPerVByte chainfee.SatPerVByte, label string,
+	opts ...SendCoinsOption) (string, error) {
 
 	rpcCtx, cancel := context.WithTimeout(ctx, s.timeout)
 	defer cancel()
 
 	rpcCtx = s.adminMac.WithMacaroonAuth(rpcCtx)
 
 	req := &lnrpc.SendCoinsRequest{
-		Addr:        addr.String(),
-		Amount:      int64(amount),
-		TargetConf:  confTarget,
-		SatPerVbyte: uint64(satsPerVByte),
-		SendAll:     sendAll,
-		Label:       label,
+		Addr:       addr.String(),
+		Amount:     int64(amount),
+		TargetConf: confTarget,
+		SatPerKw:   uint64(satsPerVByte.FeePerKWeight()),
+		SendAll:    sendAll,
+		Label:      label,
+	}
+
+	for _, opt := range opts {
+		opt(req)
 	}
 
 	resp, err := s.client.SendCoins(rpcCtx, req)

walletkit_client.go

@@ -809,8 +809,8 @@ func (m *walletKitClient) BumpFee(ctx context.Context, op wire.OutPoint,
 			TxidBytes:   op.Hash[:],
 			OutputIndex: op.Index,
 		},
-		SatPerVbyte: uint64(feeRate.FeePerVByte()),
-		Immediate:   false,
+		SatPerKw:  uint64(feeRate),
+		Immediate: false,
 	}
 
 	for _, opt := range opts {