sweep+walletrpc+lncli: report requested fee preference for pending sweeps

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,
 	}
 }