sweep+walletrpc+lncli: report requested fee preference for pending sw…

…eeps

Previously only the fee rate used for the last sweep (the sweep bucket
average) was reported. This commit adds the request fee preference to
the report, which is used to select a bucket and the sweep tx fee rate.

cmd/lncli/walletrpc_types.go

@@ -11,6 +11,8 @@ type PendingSweep struct {
 	SatPerByte          uint32   `json:"sat_per_byte"`
 	BroadcastAttempts   uint32   `json:"broadcast_attempts"`
 	NextBroadcastHeight uint32   `json:"next_broadcast_height"`
+	RequestedSatPerByte uint32   `json:"requested_sat_per_byte"`
+	RequestedConfTarget uint32   `json:"requested_conf_target"`
 }
 
 // NewPendingSweepFromProto converts the walletrpc.PendingSweep proto type into
@@ -23,5 +25,7 @@ func NewPendingSweepFromProto(pendingSweep *walletrpc.PendingSweep) *PendingSwee
 		SatPerByte:          pendingSweep.SatPerByte,
 		BroadcastAttempts:   pendingSweep.BroadcastAttempts,
 		NextBroadcastHeight: pendingSweep.NextBroadcastHeight,
+		RequestedSatPerByte: pendingSweep.RequestedSatPerByte,
+		RequestedConfTarget: pendingSweep.RequestedConfTarget,
 	}
 }

lnrpc/walletrpc/walletkit.proto

@@ -191,6 +191,12 @@ message PendingSweep {
     sweep transaction of the output.
     */
     uint32 next_broadcast_height = 6 [json_name = "next_broadcast_height"];
+
+    // The requested confirmation target for this output.
+    uint32 requested_conf_target = 8 [json_name = "requested_conf_target"];
+
+    // The requested fee rate, expressed in sat/byte, for this output.
+    uint32 requested_sat_per_byte = 9 [json_name = "requested_sat_per_byte"];
 }
 
 message PendingSweepsRequest {

lnrpc/walletrpc/walletkit_server.go

@@ -404,13 +404,18 @@ func (w *WalletKit) PendingSweeps(ctx context.Context,
 		broadcastAttempts := uint32(pendingInput.BroadcastAttempts)
 		nextBroadcastHeight := uint32(pendingInput.NextBroadcastHeight)
 
+		requestedFee := pendingInput.Params.Fee
+		requestedFeeRate := uint32(requestedFee.FeeRate.FeePerKVByte() / 1000)
+
 		rpcPendingSweeps = append(rpcPendingSweeps, &PendingSweep{
 			Outpoint:            op,
 			WitnessType:         witnessType,
 			AmountSat:           amountSat,
 			SatPerByte:          satPerByte,
 			BroadcastAttempts:   broadcastAttempts,
 			NextBroadcastHeight: nextBroadcastHeight,
+			RequestedSatPerByte: requestedFeeRate,
+			RequestedConfTarget: requestedFee.ConfTarget,
 		})
 	}
 

sweep/sweeper.go

@@ -146,6 +146,9 @@ type PendingInput struct {
 	// NextBroadcastHeight is the next height of the chain at which we'll
 	// attempt to broadcast a transaction sweeping the input.
 	NextBroadcastHeight uint32
+
+	// Params contains the sweep parameters for this pending request.
+	Params Params
 }
 
 // bumpFeeReq is an internal message we'll use to represent an external caller's
@@ -1034,6 +1037,7 @@ func (s *UtxoSweeper) handlePendingSweepsReq(
 			LastFeeRate:         pendingInput.lastFeeRate,
 			BroadcastAttempts:   pendingInput.publishAttempts,
 			NextBroadcastHeight: uint32(pendingInput.minPublishHeight),
+			Params:              pendingInput.params,
 		}
 	}