diff --git a/htlcswitch/htlcnotifier.go b/htlcswitch/htlcnotifier.go
index 25953e656659..b0ad8bc14586 100644
--- a/htlcswitch/htlcnotifier.go
+++ b/htlcswitch/htlcnotifier.go
@@ -219,8 +219,31 @@ type ForwardingEvent struct {
 	// receive, or as part of a forward.
 	HtlcEventType
 
-	// Timestamp is the time when this htlc was forwarded.
-	Timestamp time.Time
+	// timestamp is the time when this htlc was forwarded.
+	timestamp time.Time
+}
+
+// Timestamp returns the time that the event occurred.
+//
+// Note: part of the HtlcEvent interface.
+func (e *ForwardingEvent) Timestamp() time.Time {
+	return e.timestamp
+}
+
+// Key returns the htlc key which identifies the htlc that
+// the event is associated with.
+//
+// Note: part of the HtlcEvent interface.
+func (e *ForwardingEvent) Key() HtlcKey {
+	return e.HtlcKey
+}
+
+// EventType returns the type of event the htlc is associated with,
+// a local send or receive, or a forward.
+//
+// Note: part of the HtlcEvent interface.
+func (e *ForwardingEvent) EventType() HtlcEventType {
+	return e.HtlcEventType
 }
 
 // LinkFailEvent describes a htlc that failed on our incoming or outgoing
@@ -248,7 +271,30 @@ type LinkFailEvent struct {
 	Incoming bool
 
 	// Timestamp is the time when the link failure occurred.
-	Timestamp time.Time
+	timestamp time.Time
+}
+
+// Timestamp returns the time that the event occurred.
+//
+// Note: part of the HtlcEvent interface.
+func (e *LinkFailEvent) Timestamp() time.Time {
+	return e.timestamp
+}
+
+// Key returns the htlc key which identifies the htlc that
+// the event is associated with.
+//
+// Note: part of the HtlcEvent interface.
+func (e *LinkFailEvent) Key() HtlcKey {
+	return e.HtlcKey
+}
+
+// EventType returns the type of event the htlc is associated with,
+// a local send or receive, or a forward.
+//
+// Note: part of the HtlcEvent interface.
+func (e *LinkFailEvent) EventType() HtlcEventType {
+	return e.HtlcEventType
 }
 
 // ForwardingFailEvent represents a htlc failure which occurred down the line
@@ -266,8 +312,31 @@ type ForwardingFailEvent struct {
 	// receive, or as part of a forward.
 	HtlcEventType
 
-	// Timestamp is the time when the forwarding failure was received.
-	Timestamp time.Time
+	// timestamp is the time when the forwarding failure was received.
+	timestamp time.Time
+}
+
+// Timestamp returns the time that the event occurred.
+//
+// Note: part of the HtlcEvent interface.
+func (e *ForwardingFailEvent) Timestamp() time.Time {
+	return e.timestamp
+}
+
+// Key returns the htlc key which identifies the htlc that
+// the event is associated with.
+//
+// Note: part of the HtlcEvent interface.
+func (e *ForwardingFailEvent) Key() HtlcKey {
+	return e.HtlcKey
+}
+
+// EventType returns the type of event the htlc is associated with,
+// a local send or receive, or a forward.
+//
+// Note: part of the HtlcEvent interface.
+func (e *ForwardingFailEvent) EventType() HtlcEventType {
+	return e.HtlcEventType
 }
 
 // SettleEvent represents a htlc that was settled. HtlcInfo is not reliably
@@ -283,8 +352,31 @@ type SettleEvent struct {
 	// receive, or as part of a forward.
 	HtlcEventType
 
-	// Timestamp is the time when this htlc was settled.
-	Timestamp time.Time
+	// timestamp is the time when this htlc was settled.
+	timestamp time.Time
+}
+
+// Timestamp returns the time that the event occurred.
+//
+// Note: part of the HtlcEvent interface.
+func (e *SettleEvent) Timestamp() time.Time {
+	return e.timestamp
+}
+
+// Key returns the htlc key which identifies the htlc that
+// the event is associated with.
+//
+// Note: part of the HtlcEvent interface.
+func (e *SettleEvent) Key() HtlcKey {
+	return e.HtlcKey
+}
+
+// EventType returns the type of event the htlc is associated with,
+// a local send or receive, or a forward.
+//
+// Note: part of the HtlcEvent interface.
+func (e *SettleEvent) EventType() HtlcEventType {
+	return e.HtlcEventType
 }
 
 // NotifyForwardingEvent notifies the HtlcNotifier than a htlc has been
@@ -298,7 +390,7 @@ func (h *HtlcNotifier) NotifyForwardingEvent(key HtlcKey, info HtlcInfo,
 		HtlcKey:       key,
 		HtlcInfo:      info,
 		HtlcEventType: eventType,
-		Timestamp:     h.now(),
+		timestamp:     h.now(),
 	}
 
 	log.Tracef("Notifying forward event: %v over %v, %v", eventType, key,
@@ -322,7 +414,7 @@ func (h *HtlcNotifier) NotifyLinkFailEvent(key HtlcKey, info HtlcInfo,
 		HtlcEventType: eventType,
 		LinkError:     linkErr,
 		Incoming:      incoming,
-		Timestamp:     h.now(),
+		timestamp:     h.now(),
 	}
 
 	log.Tracef("Notifying link failure event: %v over %v, %v", eventType,
@@ -343,7 +435,7 @@ func (h *HtlcNotifier) NotifyForwardingFailEvent(key HtlcKey,
 	event := &ForwardingFailEvent{
 		HtlcKey:       key,
 		HtlcEventType: eventType,
-		Timestamp:     h.now(),
+		timestamp:     h.now(),
 	}
 
 	log.Tracef("Notifying forwarding failure event: %v over %v", eventType,
@@ -362,7 +454,7 @@ func (h *HtlcNotifier) NotifySettleEvent(key HtlcKey, eventType HtlcEventType) {
 	event := &SettleEvent{
 		HtlcKey:       key,
 		HtlcEventType: eventType,
-		Timestamp:     h.now(),
+		timestamp:     h.now(),
 	}
 
 	log.Tracef("Notifying settle event: %v over %v", eventType, key)
diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go
index b28d137f5a88..378f53b566c8 100644
--- a/htlcswitch/interfaces.go
+++ b/htlcswitch/interfaces.go
@@ -1,6 +1,8 @@
 package htlcswitch
 
 import (
+	"time"
+
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/invoices"
@@ -206,3 +208,17 @@ type htlcNotifier interface {
 	// settled.
 	NotifySettleEvent(key HtlcKey, eventType HtlcEventType)
 }
+
+// HtlcEvent is an interface that is implemented by all htlc events.
+type HtlcEvent interface {
+	// Key returns the htlc key which identifies the htlc that
+	// the event is associated with.
+	Key() HtlcKey
+
+	// Timestamp returns the time that the event occurred.
+	Timestamp() time.Time
+
+	// EventType returns the type of event the htlc is associated with,
+	// a local send or receive, or a forward.
+	EventType() HtlcEventType
+}
diff --git a/htlcswitch/switch_test.go b/htlcswitch/switch_test.go
index 9cfed11774e7..f82643b91ca8 100644
--- a/htlcswitch/switch_test.go
+++ b/htlcswitch/switch_test.go
@@ -2708,7 +2708,7 @@ func TestInvalidFailure(t *testing.T) {
 // these tests.
 type htlcNotifierEvents func(channels *clusterChannels, htlcID uint64,
 	ts time.Time, htlc *lnwire.UpdateAddHTLC,
-	hops []*hop.Payload) ([]interface{}, []interface{}, []interface{})
+	hops []*hop.Payload) ([]HtlcEvent, []HtlcEvent, []HtlcEvent)
 
 // TestHtlcNotifier tests the notifying of htlc events that are routed over a
 // three hop network. It sets up an Alice -> Bob -> Carol network and routes
@@ -2739,8 +2739,8 @@ func TestHtlcNotifier(t *testing.T) {
 			expectedEvents: func(channels *clusterChannels,
 				htlcID uint64, ts time.Time,
 				htlc *lnwire.UpdateAddHTLC,
-				hops []*hop.Payload) ([]interface{},
-				[]interface{}, []interface{}) {
+				hops []*hop.Payload) ([]HtlcEvent,
+				[]HtlcEvent, []HtlcEvent) {
 
 				return getThreeHopEvents(
 					channels, htlcID, ts, htlc, hops, nil,
@@ -2758,8 +2758,8 @@ func TestHtlcNotifier(t *testing.T) {
 			expectedEvents: func(channels *clusterChannels,
 				htlcID uint64, ts time.Time,
 				htlc *lnwire.UpdateAddHTLC,
-				hops []*hop.Payload) ([]interface{},
-				[]interface{}, []interface{}) {
+				hops []*hop.Payload) ([]HtlcEvent,
+				[]HtlcEvent, []HtlcEvent) {
 
 				return getThreeHopEvents(
 					channels, htlcID, ts, htlc, hops,
@@ -2893,7 +2893,7 @@ func testHtcNotifier(t *testing.T, testOpts []serverOption, iterations int,
 // checkHtlcEvents checks that a subscription has the set of htlc events
 // we expect it to have.
 func checkHtlcEvents(t *testing.T, events <-chan interface{},
-	expectedEvents []interface{}) {
+	expectedEvents []HtlcEvent) {
 
 	for _, expected := range expectedEvents {
 		select {
@@ -2949,7 +2949,7 @@ func (n *threeHopNetwork) sendThreeHopPayment(t *testing.T) (*lnwire.UpdateAddHT
 // of events will fail on Bob's outgoing link.
 func getThreeHopEvents(channels *clusterChannels, htlcID uint64,
 	ts time.Time, htlc *lnwire.UpdateAddHTLC, hops []*hop.Payload,
-	linkError *LinkError) ([]interface{}, []interface{}, []interface{}) {
+	linkError *LinkError) ([]HtlcEvent, []HtlcEvent, []HtlcEvent) {
 
 	aliceKey := HtlcKey{
 		IncomingCircuit: zeroCircuit,
@@ -2961,7 +2961,7 @@ func getThreeHopEvents(channels *clusterChannels, htlcID uint64,
 
 	// Alice always needs a forwarding event because she initiates the
 	// send.
-	aliceEvents := []interface{}{
+	aliceEvents := []HtlcEvent{
 		&ForwardingEvent{
 			HtlcKey: aliceKey,
 			HtlcInfo: HtlcInfo{
@@ -2969,7 +2969,7 @@ func getThreeHopEvents(channels *clusterChannels, htlcID uint64,
 				OutgoingAmt:      htlc.Amount,
 			},
 			HtlcEventType: HtlcEventTypeSend,
-			Timestamp:     ts,
+			timestamp:     ts,
 		},
 	}
 
@@ -2998,18 +2998,18 @@ func getThreeHopEvents(channels *clusterChannels, htlcID uint64,
 			&ForwardingFailEvent{
 				HtlcKey:       aliceKey,
 				HtlcEventType: HtlcEventTypeSend,
-				Timestamp:     ts,
+				timestamp:     ts,
 			},
 		)
 
-		bobEvents := []interface{}{
+		bobEvents := []HtlcEvent{
 			&LinkFailEvent{
 				HtlcKey:       bobKey,
 				HtlcInfo:      bobInfo,
 				HtlcEventType: HtlcEventTypeForward,
 				LinkError:     linkError,
 				Incoming:      false,
-				Timestamp:     ts,
+				timestamp:     ts,
 			},
 		}
 
@@ -3024,25 +3024,25 @@ func getThreeHopEvents(channels *clusterChannels, htlcID uint64,
 		&SettleEvent{
 			HtlcKey:       aliceKey,
 			HtlcEventType: HtlcEventTypeSend,
-			Timestamp:     ts,
+			timestamp:     ts,
 		},
 	)
 
-	bobEvents := []interface{}{
+	bobEvents := []HtlcEvent{
 		&ForwardingEvent{
 			HtlcKey:       bobKey,
 			HtlcInfo:      bobInfo,
 			HtlcEventType: HtlcEventTypeForward,
-			Timestamp:     ts,
+			timestamp:     ts,
 		},
 		&SettleEvent{
 			HtlcKey:       bobKey,
 			HtlcEventType: HtlcEventTypeForward,
-			Timestamp:     ts,
+			timestamp:     ts,
 		},
 	}
 
-	carolEvents := []interface{}{
+	carolEvents := []HtlcEvent{
 		&SettleEvent{
 			HtlcKey: HtlcKey{
 				IncomingCircuit: channeldb.CircuitKey{
@@ -3052,7 +3052,7 @@ func getThreeHopEvents(channels *clusterChannels, htlcID uint64,
 				OutgoingCircuit: zeroCircuit,
 			},
 			HtlcEventType: HtlcEventTypeReceive,
-			Timestamp:     ts,
+			timestamp:     ts,
 		},
 	}
 
diff --git a/lnrpc/routerrpc/router.pb.go b/lnrpc/routerrpc/router.pb.go
index 25aa0b0911ba..a300bd1cda55 100644
--- a/lnrpc/routerrpc/router.pb.go
+++ b/lnrpc/routerrpc/router.pb.go
@@ -79,6 +79,94 @@ func (PaymentState) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_7a0613f69d37b0a5, []int{0}
 }
 
+type FailureDetail int32
+
+const (
+	FailureDetail_UNKNOWN                 FailureDetail = 0
+	FailureDetail_NO_DETAIL               FailureDetail = 1
+	FailureDetail_ONION_DECODE            FailureDetail = 2
+	FailureDetail_LINK_NOT_ELIGIBLE       FailureDetail = 3
+	FailureDetail_ON_CHAIN_TIMEOUT        FailureDetail = 4
+	FailureDetail_HTLC_EXCEEDS_MAX        FailureDetail = 5
+	FailureDetail_INSUFFICIENT_BALANCE    FailureDetail = 6
+	FailureDetail_INCOMPLETE_FORWARD      FailureDetail = 7
+	FailureDetail_HTLC_ADD_FAILED         FailureDetail = 8
+	FailureDetail_FORWARDS_DISABLED       FailureDetail = 9
+	FailureDetail_INVOICE_CANCELED        FailureDetail = 10
+	FailureDetail_INVOICE_UNDERPAID       FailureDetail = 11
+	FailureDetail_INVOICE_EXPIRY_TOO_SOON FailureDetail = 12
+	FailureDetail_INVOICE_NOT_OPEN        FailureDetail = 13
+	FailureDetail_MPP_INVOICE_TIMEOUT     FailureDetail = 14
+	FailureDetail_ADDRESS_MISMATCH        FailureDetail = 15
+	FailureDetail_SET_TOTAL_MISMATCH      FailureDetail = 16
+	FailureDetail_SET_TOTAL_TOO_LOW       FailureDetail = 17
+	FailureDetail_SET_OVERPAID            FailureDetail = 18
+	FailureDetail_UNKNOWN_INVOICE         FailureDetail = 19
+	FailureDetail_INVALID_KEYSEND         FailureDetail = 20
+	FailureDetail_MPP_IN_PROGRESS         FailureDetail = 21
+	FailureDetail_CIRCULAR_ROUTE          FailureDetail = 22
+)
+
+var FailureDetail_name = map[int32]string{
+	0:  "UNKNOWN",
+	1:  "NO_DETAIL",
+	2:  "ONION_DECODE",
+	3:  "LINK_NOT_ELIGIBLE",
+	4:  "ON_CHAIN_TIMEOUT",
+	5:  "HTLC_EXCEEDS_MAX",
+	6:  "INSUFFICIENT_BALANCE",
+	7:  "INCOMPLETE_FORWARD",
+	8:  "HTLC_ADD_FAILED",
+	9:  "FORWARDS_DISABLED",
+	10: "INVOICE_CANCELED",
+	11: "INVOICE_UNDERPAID",
+	12: "INVOICE_EXPIRY_TOO_SOON",
+	13: "INVOICE_NOT_OPEN",
+	14: "MPP_INVOICE_TIMEOUT",
+	15: "ADDRESS_MISMATCH",
+	16: "SET_TOTAL_MISMATCH",
+	17: "SET_TOTAL_TOO_LOW",
+	18: "SET_OVERPAID",
+	19: "UNKNOWN_INVOICE",
+	20: "INVALID_KEYSEND",
+	21: "MPP_IN_PROGRESS",
+	22: "CIRCULAR_ROUTE",
+}
+
+var FailureDetail_value = map[string]int32{
+	"UNKNOWN":                 0,
+	"NO_DETAIL":               1,
+	"ONION_DECODE":            2,
+	"LINK_NOT_ELIGIBLE":       3,
+	"ON_CHAIN_TIMEOUT":        4,
+	"HTLC_EXCEEDS_MAX":        5,
+	"INSUFFICIENT_BALANCE":    6,
+	"INCOMPLETE_FORWARD":      7,
+	"HTLC_ADD_FAILED":         8,
+	"FORWARDS_DISABLED":       9,
+	"INVOICE_CANCELED":        10,
+	"INVOICE_UNDERPAID":       11,
+	"INVOICE_EXPIRY_TOO_SOON": 12,
+	"INVOICE_NOT_OPEN":        13,
+	"MPP_INVOICE_TIMEOUT":     14,
+	"ADDRESS_MISMATCH":        15,
+	"SET_TOTAL_MISMATCH":      16,
+	"SET_TOTAL_TOO_LOW":       17,
+	"SET_OVERPAID":            18,
+	"UNKNOWN_INVOICE":         19,
+	"INVALID_KEYSEND":         20,
+	"MPP_IN_PROGRESS":         21,
+	"CIRCULAR_ROUTE":          22,
+}
+
+func (x FailureDetail) String() string {
+	return proto.EnumName(FailureDetail_name, int32(x))
+}
+
+func (FailureDetail) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{1}
+}
+
 type Failure_FailureCode int32
 
 const (
@@ -185,6 +273,37 @@ func (Failure_FailureCode) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_7a0613f69d37b0a5, []int{7, 0}
 }
 
+type HtlcEvent_EventType int32
+
+const (
+	HtlcEvent_UNKNOWN HtlcEvent_EventType = 0
+	HtlcEvent_SEND    HtlcEvent_EventType = 1
+	HtlcEvent_RECEIVE HtlcEvent_EventType = 2
+	HtlcEvent_FORWARD HtlcEvent_EventType = 3
+)
+
+var HtlcEvent_EventType_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "SEND",
+	2: "RECEIVE",
+	3: "FORWARD",
+}
+
+var HtlcEvent_EventType_value = map[string]int32{
+	"UNKNOWN": 0,
+	"SEND":    1,
+	"RECEIVE": 2,
+	"FORWARD": 3,
+}
+
+func (x HtlcEvent_EventType) String() string {
+	return proto.EnumName(HtlcEvent_EventType_name, int32(x))
+}
+
+func (HtlcEvent_EventType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{20, 0}
+}
+
 type SendPaymentRequest struct {
 	/// The identity pubkey of the payment recipient
 	Dest []byte `protobuf:"bytes,1,opt,name=dest,proto3" json:"dest,omitempty"`
@@ -1501,9 +1620,408 @@ func (m *BuildRouteResponse) GetRoute() *lnrpc.Route {
 	return nil
 }
 
+type SubscribeHtlcEventsRequest struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SubscribeHtlcEventsRequest) Reset()         { *m = SubscribeHtlcEventsRequest{} }
+func (m *SubscribeHtlcEventsRequest) String() string { return proto.CompactTextString(m) }
+func (*SubscribeHtlcEventsRequest) ProtoMessage()    {}
+func (*SubscribeHtlcEventsRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{19}
+}
+
+func (m *SubscribeHtlcEventsRequest) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SubscribeHtlcEventsRequest.Unmarshal(m, b)
+}
+func (m *SubscribeHtlcEventsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SubscribeHtlcEventsRequest.Marshal(b, m, deterministic)
+}
+func (m *SubscribeHtlcEventsRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SubscribeHtlcEventsRequest.Merge(m, src)
+}
+func (m *SubscribeHtlcEventsRequest) XXX_Size() int {
+	return xxx_messageInfo_SubscribeHtlcEventsRequest.Size(m)
+}
+func (m *SubscribeHtlcEventsRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_SubscribeHtlcEventsRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SubscribeHtlcEventsRequest proto.InternalMessageInfo
+
+type HtlcEvent struct {
+	//*
+	//IncomingChannel is the channel that the incoming htlc arrived at our node
+	//on. This value is zero for sends.
+	IncomingChannel uint64 `protobuf:"varint,1,opt,name=incoming_channel,proto3" json:"incoming_channel,omitempty"`
+	//*
+	//Outgoing channel is the channel that the outgoing htlc left our node on.
+	//This value is zero for receives.
+	OutgoingChannel uint64 `protobuf:"varint,2,opt,name=outgoing_channel,proto3" json:"outgoing_channel,omitempty"`
+	//*
+	//Incoming id is the index of the incoming htlc in the incoming channel.
+	//This value is zero for sends.
+	IncomingHtlcId uint64 `protobuf:"varint,3,opt,name=incoming_htlc_id,proto3" json:"incoming_htlc_id,omitempty"`
+	//*
+	//Outgoing id is the index of the outgoing htlc in the outgoing channel.
+	//This value is zero for receives.
+	OutgoingHtlcId uint64 `protobuf:"varint,4,opt,name=outgoing_htlc_id,proto3" json:"outgoing_htlc_id,omitempty"`
+	// The timelock on the incoming htlc.
+	IncomingTimelock uint32 `protobuf:"varint,5,opt,name=incoming_timelock,proto3" json:"incoming_timelock,omitempty"`
+	// The timelock on the outgoing htlc.
+	OutgoingTimelock uint32 `protobuf:"varint,6,opt,name=outgoing_timelock,proto3" json:"outgoing_timelock,omitempty"`
+	// The amount of the incoming htlc.
+	IncomingAmtMsat uint64 `protobuf:"varint,7,opt,name=incoming_amt_msat,proto3" json:"incoming_amt_msat,omitempty"`
+	// The amount of the outgoing htlc.
+	OutgoingAmtMsat uint64 `protobuf:"varint,8,opt,name=outgoing_amt_msat,proto3" json:"outgoing_amt_msat,omitempty"`
+	//*
+	//Timestamp is the time (unix epoch offset in seconds) that the event
+	//occurred.
+	Timestamp uint64 `protobuf:"varint,9,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	//*
+	//The event type indicates whether the htlc was part of a send, receive or
+	//forward.
+	EventType HtlcEvent_EventType `protobuf:"varint,10,opt,name=event_type,proto3,enum=routerrpc.HtlcEvent_EventType" json:"event_type,omitempty"`
+	// Types that are valid to be assigned to Event:
+	//	*HtlcEvent_ForwardEvent
+	//	*HtlcEvent_ForwardFailEvent
+	//	*HtlcEvent_SettleEvent
+	//	*HtlcEvent_LinkFailEvent
+	Event                isHtlcEvent_Event `protobuf_oneof:"event"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *HtlcEvent) Reset()         { *m = HtlcEvent{} }
+func (m *HtlcEvent) String() string { return proto.CompactTextString(m) }
+func (*HtlcEvent) ProtoMessage()    {}
+func (*HtlcEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{20}
+}
+
+func (m *HtlcEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_HtlcEvent.Unmarshal(m, b)
+}
+func (m *HtlcEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_HtlcEvent.Marshal(b, m, deterministic)
+}
+func (m *HtlcEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HtlcEvent.Merge(m, src)
+}
+func (m *HtlcEvent) XXX_Size() int {
+	return xxx_messageInfo_HtlcEvent.Size(m)
+}
+func (m *HtlcEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_HtlcEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HtlcEvent proto.InternalMessageInfo
+
+func (m *HtlcEvent) GetIncomingChannel() uint64 {
+	if m != nil {
+		return m.IncomingChannel
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetOutgoingChannel() uint64 {
+	if m != nil {
+		return m.OutgoingChannel
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetIncomingHtlcId() uint64 {
+	if m != nil {
+		return m.IncomingHtlcId
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetOutgoingHtlcId() uint64 {
+	if m != nil {
+		return m.OutgoingHtlcId
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetIncomingTimelock() uint32 {
+	if m != nil {
+		return m.IncomingTimelock
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetOutgoingTimelock() uint32 {
+	if m != nil {
+		return m.OutgoingTimelock
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetIncomingAmtMsat() uint64 {
+	if m != nil {
+		return m.IncomingAmtMsat
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetOutgoingAmtMsat() uint64 {
+	if m != nil {
+		return m.OutgoingAmtMsat
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetTimestamp() uint64 {
+	if m != nil {
+		return m.Timestamp
+	}
+	return 0
+}
+
+func (m *HtlcEvent) GetEventType() HtlcEvent_EventType {
+	if m != nil {
+		return m.EventType
+	}
+	return HtlcEvent_UNKNOWN
+}
+
+type isHtlcEvent_Event interface {
+	isHtlcEvent_Event()
+}
+
+type HtlcEvent_ForwardEvent struct {
+	ForwardEvent *ForwardEvent `protobuf:"bytes,11,opt,name=forward_event,proto3,oneof"`
+}
+
+type HtlcEvent_ForwardFailEvent struct {
+	ForwardFailEvent *ForwardFailEvent `protobuf:"bytes,12,opt,name=forward_fail_event,proto3,oneof"`
+}
+
+type HtlcEvent_SettleEvent struct {
+	SettleEvent *SettleEvent `protobuf:"bytes,13,opt,name=settle_event,proto3,oneof"`
+}
+
+type HtlcEvent_LinkFailEvent struct {
+	LinkFailEvent *LinkFailEvent `protobuf:"bytes,14,opt,name=link_fail_event,proto3,oneof"`
+}
+
+func (*HtlcEvent_ForwardEvent) isHtlcEvent_Event() {}
+
+func (*HtlcEvent_ForwardFailEvent) isHtlcEvent_Event() {}
+
+func (*HtlcEvent_SettleEvent) isHtlcEvent_Event() {}
+
+func (*HtlcEvent_LinkFailEvent) isHtlcEvent_Event() {}
+
+func (m *HtlcEvent) GetEvent() isHtlcEvent_Event {
+	if m != nil {
+		return m.Event
+	}
+	return nil
+}
+
+func (m *HtlcEvent) GetForwardEvent() *ForwardEvent {
+	if x, ok := m.GetEvent().(*HtlcEvent_ForwardEvent); ok {
+		return x.ForwardEvent
+	}
+	return nil
+}
+
+func (m *HtlcEvent) GetForwardFailEvent() *ForwardFailEvent {
+	if x, ok := m.GetEvent().(*HtlcEvent_ForwardFailEvent); ok {
+		return x.ForwardFailEvent
+	}
+	return nil
+}
+
+func (m *HtlcEvent) GetSettleEvent() *SettleEvent {
+	if x, ok := m.GetEvent().(*HtlcEvent_SettleEvent); ok {
+		return x.SettleEvent
+	}
+	return nil
+}
+
+func (m *HtlcEvent) GetLinkFailEvent() *LinkFailEvent {
+	if x, ok := m.GetEvent().(*HtlcEvent_LinkFailEvent); ok {
+		return x.LinkFailEvent
+	}
+	return nil
+}
+
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*HtlcEvent) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
+		(*HtlcEvent_ForwardEvent)(nil),
+		(*HtlcEvent_ForwardFailEvent)(nil),
+		(*HtlcEvent_SettleEvent)(nil),
+		(*HtlcEvent_LinkFailEvent)(nil),
+	}
+}
+
+type ForwardEvent struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ForwardEvent) Reset()         { *m = ForwardEvent{} }
+func (m *ForwardEvent) String() string { return proto.CompactTextString(m) }
+func (*ForwardEvent) ProtoMessage()    {}
+func (*ForwardEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{21}
+}
+
+func (m *ForwardEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ForwardEvent.Unmarshal(m, b)
+}
+func (m *ForwardEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ForwardEvent.Marshal(b, m, deterministic)
+}
+func (m *ForwardEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ForwardEvent.Merge(m, src)
+}
+func (m *ForwardEvent) XXX_Size() int {
+	return xxx_messageInfo_ForwardEvent.Size(m)
+}
+func (m *ForwardEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_ForwardEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ForwardEvent proto.InternalMessageInfo
+
+type ForwardFailEvent struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ForwardFailEvent) Reset()         { *m = ForwardFailEvent{} }
+func (m *ForwardFailEvent) String() string { return proto.CompactTextString(m) }
+func (*ForwardFailEvent) ProtoMessage()    {}
+func (*ForwardFailEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{22}
+}
+
+func (m *ForwardFailEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ForwardFailEvent.Unmarshal(m, b)
+}
+func (m *ForwardFailEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ForwardFailEvent.Marshal(b, m, deterministic)
+}
+func (m *ForwardFailEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ForwardFailEvent.Merge(m, src)
+}
+func (m *ForwardFailEvent) XXX_Size() int {
+	return xxx_messageInfo_ForwardFailEvent.Size(m)
+}
+func (m *ForwardFailEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_ForwardFailEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ForwardFailEvent proto.InternalMessageInfo
+
+type SettleEvent struct {
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SettleEvent) Reset()         { *m = SettleEvent{} }
+func (m *SettleEvent) String() string { return proto.CompactTextString(m) }
+func (*SettleEvent) ProtoMessage()    {}
+func (*SettleEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{23}
+}
+
+func (m *SettleEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SettleEvent.Unmarshal(m, b)
+}
+func (m *SettleEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SettleEvent.Marshal(b, m, deterministic)
+}
+func (m *SettleEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SettleEvent.Merge(m, src)
+}
+func (m *SettleEvent) XXX_Size() int {
+	return xxx_messageInfo_SettleEvent.Size(m)
+}
+func (m *SettleEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_SettleEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SettleEvent proto.InternalMessageInfo
+
+type LinkFailEvent struct {
+	// FailureCode is the BOLT error code for the failure.
+	WireFailure Failure_FailureCode `protobuf:"varint,1,opt,name=wire_failure,proto3,enum=routerrpc.Failure_FailureCode" json:"wire_failure,omitempty"`
+	//*
+	//FailureDetail provides additional information about the reason for the
+	//failure. This detail enriches the information provided by the wire message
+	//and may be 'no detail' if the wire message requires no additional metadata.
+	FailureDetail FailureDetail `protobuf:"varint,2,opt,name=failure_detail,proto3,enum=routerrpc.FailureDetail" json:"failure_detail,omitempty"`
+	// A string representation of the link failure.
+	FailureString        string   `protobuf:"bytes,3,opt,name=failure_string,proto3" json:"failure_string,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LinkFailEvent) Reset()         { *m = LinkFailEvent{} }
+func (m *LinkFailEvent) String() string { return proto.CompactTextString(m) }
+func (*LinkFailEvent) ProtoMessage()    {}
+func (*LinkFailEvent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_7a0613f69d37b0a5, []int{24}
+}
+
+func (m *LinkFailEvent) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LinkFailEvent.Unmarshal(m, b)
+}
+func (m *LinkFailEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LinkFailEvent.Marshal(b, m, deterministic)
+}
+func (m *LinkFailEvent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LinkFailEvent.Merge(m, src)
+}
+func (m *LinkFailEvent) XXX_Size() int {
+	return xxx_messageInfo_LinkFailEvent.Size(m)
+}
+func (m *LinkFailEvent) XXX_DiscardUnknown() {
+	xxx_messageInfo_LinkFailEvent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LinkFailEvent proto.InternalMessageInfo
+
+func (m *LinkFailEvent) GetWireFailure() Failure_FailureCode {
+	if m != nil {
+		return m.WireFailure
+	}
+	return Failure_RESERVED
+}
+
+func (m *LinkFailEvent) GetFailureDetail() FailureDetail {
+	if m != nil {
+		return m.FailureDetail
+	}
+	return FailureDetail_UNKNOWN
+}
+
+func (m *LinkFailEvent) GetFailureString() string {
+	if m != nil {
+		return m.FailureString
+	}
+	return ""
+}
+
 func init() {
 	proto.RegisterEnum("routerrpc.PaymentState", PaymentState_name, PaymentState_value)
+	proto.RegisterEnum("routerrpc.FailureDetail", FailureDetail_name, FailureDetail_value)
 	proto.RegisterEnum("routerrpc.Failure_FailureCode", Failure_FailureCode_name, Failure_FailureCode_value)
+	proto.RegisterEnum("routerrpc.HtlcEvent_EventType", HtlcEvent_EventType_name, HtlcEvent_EventType_value)
 	proto.RegisterType((*SendPaymentRequest)(nil), "routerrpc.SendPaymentRequest")
 	proto.RegisterMapType((map[uint64][]byte)(nil), "routerrpc.SendPaymentRequest.DestCustomRecordsEntry")
 	proto.RegisterType((*TrackPaymentRequest)(nil), "routerrpc.TrackPaymentRequest")
@@ -1524,144 +2042,188 @@ func init() {
 	proto.RegisterType((*QueryProbabilityResponse)(nil), "routerrpc.QueryProbabilityResponse")
 	proto.RegisterType((*BuildRouteRequest)(nil), "routerrpc.BuildRouteRequest")
 	proto.RegisterType((*BuildRouteResponse)(nil), "routerrpc.BuildRouteResponse")
+	proto.RegisterType((*SubscribeHtlcEventsRequest)(nil), "routerrpc.SubscribeHtlcEventsRequest")
+	proto.RegisterType((*HtlcEvent)(nil), "routerrpc.HtlcEvent")
+	proto.RegisterType((*ForwardEvent)(nil), "routerrpc.ForwardEvent")
+	proto.RegisterType((*ForwardFailEvent)(nil), "routerrpc.ForwardFailEvent")
+	proto.RegisterType((*SettleEvent)(nil), "routerrpc.SettleEvent")
+	proto.RegisterType((*LinkFailEvent)(nil), "routerrpc.LinkFailEvent")
 }
 
 func init() { proto.RegisterFile("routerrpc/router.proto", fileDescriptor_7a0613f69d37b0a5) }
 
 var fileDescriptor_7a0613f69d37b0a5 = []byte{
-	// 2102 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0xcb, 0x73, 0xdb, 0xc6,
-	0x19, 0x0f, 0xc4, 0xf7, 0xc7, 0x17, 0xb4, 0x92, 0x65, 0x98, 0xb2, 0x62, 0x05, 0x76, 0x1d, 0x8e,
-	0xc7, 0x91, 0x5c, 0xb5, 0xf1, 0x78, 0x7a, 0x68, 0x87, 0x22, 0xc1, 0x08, 0x32, 0x09, 0xca, 0x4b,
-	0xd2, 0x89, 0x9b, 0xc3, 0x0e, 0x44, 0xae, 0x44, 0x8c, 0x40, 0x80, 0x01, 0x96, 0x8e, 0xf5, 0x0f,
-	0xf4, 0xd4, 0xff, 0xa3, 0xbd, 0xb4, 0x97, 0x9e, 0xfb, 0xef, 0xb4, 0xf7, 0xde, 0x7a, 0xeb, 0xec,
-	0x2e, 0x40, 0x82, 0x14, 0xe5, 0xf4, 0x44, 0xec, 0xef, 0x7b, 0xed, 0xee, 0xb7, 0xdf, 0x8b, 0xb0,
-	0x17, 0xf8, 0x73, 0x46, 0x83, 0x60, 0x36, 0x3a, 0x96, 0x5f, 0x47, 0xb3, 0xc0, 0x67, 0x3e, 0x2a,
-	0x2c, 0xf0, 0x5a, 0x21, 0x98, 0x8d, 0x24, 0xaa, 0xff, 0x37, 0x03, 0xa8, 0x4f, 0xbd, 0xf1, 0x85,
-	0x7d, 0x3b, 0xa5, 0x1e, 0xc3, 0xf4, 0xa7, 0x39, 0x0d, 0x19, 0x42, 0x90, 0x1e, 0xd3, 0x90, 0x69,
-	0xca, 0xa1, 0x52, 0x2f, 0x61, 0xf1, 0x8d, 0x54, 0x48, 0xd9, 0x53, 0xa6, 0x6d, 0x1d, 0x2a, 0xf5,
-	0x14, 0xe6, 0x9f, 0xe8, 0x11, 0xe4, 0xed, 0x29, 0x23, 0xd3, 0xd0, 0x66, 0x5a, 0x49, 0xc0, 0x39,
-	0x7b, 0xca, 0xba, 0xa1, 0xcd, 0xd0, 0x57, 0x50, 0x9a, 0x49, 0x95, 0x64, 0x62, 0x87, 0x13, 0x2d,
-	0x25, 0x14, 0x15, 0x23, 0xec, 0xcc, 0x0e, 0x27, 0xa8, 0x0e, 0xea, 0x95, 0xe3, 0xd9, 0x2e, 0x19,
-	0xb9, 0xec, 0x23, 0x19, 0x53, 0x97, 0xd9, 0x5a, 0xfa, 0x50, 0xa9, 0x67, 0x70, 0x45, 0xe0, 0x4d,
-	0x97, 0x7d, 0x6c, 0x71, 0x14, 0x7d, 0x0d, 0xd5, 0x58, 0x59, 0x20, 0x37, 0xa8, 0x65, 0x0e, 0x95,
-	0x7a, 0x01, 0x57, 0x66, 0xab, 0xdb, 0xfe, 0x1a, 0xaa, 0xcc, 0x99, 0x52, 0x7f, 0xce, 0x48, 0x48,
-	0x47, 0xbe, 0x37, 0x0e, 0xb5, 0xac, 0xd4, 0x18, 0xc1, 0x7d, 0x89, 0x22, 0x1d, 0xca, 0x57, 0x94,
-	0x12, 0xd7, 0x99, 0x3a, 0x8c, 0xf0, 0xed, 0xe7, 0xc4, 0xf6, 0x8b, 0x57, 0x94, 0x76, 0x38, 0xd6,
-	0xb7, 0x19, 0x7a, 0x06, 0x95, 0x25, 0x8f, 0x38, 0x63, 0x59, 0x30, 0x95, 0x62, 0x26, 0x71, 0xd0,
-	0x97, 0xa0, 0xfa, 0x73, 0x76, 0xed, 0x3b, 0xde, 0x35, 0x19, 0x4d, 0x6c, 0x8f, 0x38, 0x63, 0x2d,
-	0x7f, 0xa8, 0xd4, 0xd3, 0xa7, 0x5b, 0xaf, 0x14, 0x5c, 0x89, 0x69, 0xcd, 0x89, 0xed, 0x99, 0x63,
-	0xf4, 0x1c, 0xaa, 0xae, 0x1d, 0x32, 0x32, 0xf1, 0x67, 0x64, 0x36, 0xbf, 0xbc, 0xa1, 0xb7, 0x5a,
-	0x45, 0xdc, 0x4c, 0x99, 0xc3, 0x67, 0xfe, 0xec, 0x42, 0x80, 0xe8, 0x00, 0x40, 0xdc, 0x8a, 0x30,
-	0xae, 0x15, 0xc4, 0x19, 0x0a, 0x1c, 0x11, 0x86, 0xd1, 0x09, 0x14, 0x85, 0x37, 0xc9, 0xc4, 0xf1,
-	0x58, 0xa8, 0xc1, 0x61, 0xaa, 0x5e, 0x3c, 0x51, 0x8f, 0x5c, 0x8f, 0x3b, 0x16, 0x73, 0xca, 0x99,
-	0xe3, 0x31, 0x9c, 0x64, 0x42, 0x63, 0xd8, 0xe1, 0x6e, 0x24, 0xa3, 0x79, 0xc8, 0xfc, 0x29, 0x09,
-	0xe8, 0xc8, 0x0f, 0xc6, 0xa1, 0x56, 0x14, 0xb2, 0xbf, 0x3d, 0x5a, 0xbc, 0x8e, 0xa3, 0xbb, 0xcf,
-	0xe1, 0xa8, 0x45, 0x43, 0xd6, 0x14, 0x72, 0x58, 0x8a, 0x19, 0x1e, 0x0b, 0x6e, 0xf1, 0xf6, 0x78,
-	0x1d, 0x47, 0x2f, 0x01, 0xd9, 0xae, 0xeb, 0xff, 0x4c, 0x42, 0xea, 0x5e, 0x91, 0xc8, 0x3d, 0x5a,
-	0xf5, 0x50, 0xa9, 0xe7, 0xb1, 0x2a, 0x28, 0x7d, 0xea, 0x5e, 0x45, 0xea, 0xd1, 0x6b, 0x28, 0x8b,
-	0x3d, 0x5d, 0x51, 0x9b, 0xcd, 0x03, 0x1a, 0x6a, 0xea, 0x61, 0xaa, 0x5e, 0x39, 0xd9, 0x8e, 0x4e,
-	0xd2, 0x96, 0xf0, 0xa9, 0xc3, 0x70, 0x89, 0xf3, 0x45, 0xeb, 0xb0, 0xd6, 0x82, 0xbd, 0xcd, 0x5b,
-	0xe2, 0x8f, 0x94, 0x5f, 0x2a, 0x7f, 0xb7, 0x69, 0xcc, 0x3f, 0xd1, 0x2e, 0x64, 0x3e, 0xda, 0xee,
-	0x9c, 0x8a, 0x87, 0x5b, 0xc2, 0x72, 0xf1, 0xbb, 0xad, 0x37, 0x8a, 0xfe, 0x06, 0x76, 0x06, 0x81,
-	0x3d, 0xba, 0x59, 0x7b, 0xfb, 0xeb, 0x4f, 0x57, 0xb9, 0xf3, 0x74, 0xf5, 0xbf, 0x2a, 0x50, 0x8e,
-	0xa4, 0xfa, 0xcc, 0x66, 0xf3, 0x10, 0x7d, 0x03, 0x99, 0x90, 0xd9, 0x8c, 0x0a, 0xee, 0xca, 0xc9,
-	0xc3, 0xc4, 0x7d, 0x26, 0x18, 0x29, 0x96, 0x5c, 0xa8, 0x06, 0xf9, 0x59, 0x40, 0x9d, 0xa9, 0x7d,
-	0x1d, 0xef, 0x6b, 0xb1, 0x46, 0x3a, 0x64, 0x84, 0xb0, 0x88, 0x99, 0xe2, 0x49, 0x29, 0xe9, 0x56,
-	0x2c, 0x49, 0xa8, 0x0e, 0x99, 0x09, 0x73, 0x47, 0xa1, 0x96, 0x16, 0xee, 0x43, 0x11, 0xcf, 0xd9,
-	0xa0, 0xd3, 0x6c, 0x30, 0x46, 0xa7, 0x33, 0x86, 0x25, 0x83, 0xfe, 0x7b, 0xa8, 0x0a, 0xc9, 0x36,
-	0xa5, 0x9f, 0x0b, 0xee, 0x87, 0xc0, 0x43, 0x57, 0x84, 0x82, 0x0c, 0xf0, 0xac, 0x3d, 0xe5, 0x51,
-	0xa0, 0x8f, 0x41, 0x5d, 0xca, 0x87, 0x33, 0xdf, 0x0b, 0xb9, 0x75, 0x95, 0x6f, 0x83, 0x3f, 0x79,
-	0x1e, 0x21, 0x22, 0x36, 0x14, 0x21, 0x55, 0x89, 0xf0, 0x36, 0xa5, 0x22, 0x3a, 0x9e, 0xcb, 0x80,
-	0x24, 0xae, 0x3f, 0xba, 0xe1, 0x21, 0x6e, 0xdf, 0x46, 0xea, 0xcb, 0x1c, 0xee, 0xf8, 0xa3, 0x9b,
-	0x16, 0x07, 0xf5, 0x1f, 0x65, 0x16, 0x1a, 0xf8, 0xf2, 0x94, 0xff, 0xb7, 0x27, 0x96, 0x97, 0xb5,
-	0x75, 0xef, 0x65, 0xe9, 0x04, 0x76, 0x56, 0x94, 0x47, 0xa7, 0x48, 0xfa, 0x40, 0x59, 0xf3, 0xc1,
-	0x4b, 0xc8, 0x5d, 0xd9, 0x8e, 0x3b, 0x0f, 0x62, 0xc5, 0x28, 0xe1, 0xd0, 0xb6, 0xa4, 0xe0, 0x98,
-	0x45, 0xff, 0x53, 0x1e, 0x72, 0x11, 0x88, 0x4e, 0x20, 0x3d, 0xf2, 0xc7, 0xf1, 0x3b, 0xf8, 0xf2,
-	0xae, 0x58, 0xfc, 0xdb, 0xf4, 0xc7, 0x14, 0x0b, 0x5e, 0xf4, 0x07, 0xa8, 0xf0, 0xd4, 0xe1, 0x51,
-	0x97, 0xcc, 0x67, 0x63, 0x7b, 0xe1, 0x7a, 0x2d, 0x21, 0xdd, 0x94, 0x0c, 0x43, 0x41, 0xc7, 0xe5,
-	0x51, 0x72, 0x89, 0xf6, 0xa1, 0xc0, 0xbd, 0x2d, 0x3d, 0x91, 0x16, 0x6f, 0x3f, 0xcf, 0x01, 0xe1,
-	0x03, 0x1d, 0xca, 0xbe, 0xe7, 0xf8, 0x1e, 0x09, 0x27, 0x36, 0x39, 0xf9, 0xf6, 0xb5, 0xc8, 0x9d,
-	0x25, 0x5c, 0x14, 0x60, 0x7f, 0x62, 0x9f, 0x7c, 0xfb, 0x1a, 0x3d, 0x81, 0xa2, 0xc8, 0x37, 0xf4,
-	0xd3, 0xcc, 0x09, 0x6e, 0x45, 0xd2, 0x2c, 0x63, 0x91, 0x82, 0x0c, 0x81, 0xf0, 0x28, 0xba, 0x72,
-	0xed, 0xeb, 0x50, 0x24, 0xca, 0x32, 0x96, 0x0b, 0xf4, 0x0a, 0x76, 0xa3, 0x3b, 0x20, 0xa1, 0x3f,
-	0x0f, 0x46, 0x94, 0x38, 0xde, 0x98, 0x7e, 0x12, 0x09, 0xb0, 0x8c, 0x51, 0x44, 0xeb, 0x0b, 0x92,
-	0xc9, 0x29, 0x68, 0x0f, 0xb2, 0x13, 0xea, 0x5c, 0x4f, 0x64, 0x52, 0x2b, 0xe3, 0x68, 0xa5, 0xff,
-	0x33, 0x03, 0xc5, 0xc4, 0xc5, 0xa0, 0x12, 0xe4, 0xb1, 0xd1, 0x37, 0xf0, 0x7b, 0xa3, 0xa5, 0x7e,
-	0x81, 0xea, 0xf0, 0xcc, 0xb4, 0x9a, 0x3d, 0x8c, 0x8d, 0xe6, 0x80, 0xf4, 0x30, 0x19, 0x5a, 0x6f,
-	0xad, 0xde, 0xf7, 0x16, 0xb9, 0x68, 0x7c, 0xe8, 0x1a, 0xd6, 0x80, 0xb4, 0x8c, 0x41, 0xc3, 0xec,
-	0xf4, 0x55, 0x05, 0x3d, 0x06, 0x6d, 0xc9, 0x19, 0x93, 0x1b, 0xdd, 0xde, 0xd0, 0x1a, 0xa8, 0x5b,
-	0xe8, 0x09, 0xec, 0xb7, 0x4d, 0xab, 0xd1, 0x21, 0x4b, 0x9e, 0x66, 0x67, 0xf0, 0x9e, 0x18, 0x3f,
-	0x5c, 0x98, 0xf8, 0x83, 0x9a, 0xda, 0xc4, 0xc0, 0x63, 0x2a, 0xd6, 0x90, 0x46, 0x8f, 0xe0, 0x81,
-	0x64, 0x90, 0x22, 0x64, 0xd0, 0xeb, 0x91, 0x7e, 0xaf, 0x67, 0xa9, 0x19, 0xb4, 0x0d, 0x65, 0xd3,
-	0x7a, 0xdf, 0xe8, 0x98, 0x2d, 0x82, 0x8d, 0x46, 0xa7, 0xab, 0x66, 0xd1, 0x0e, 0x54, 0xd7, 0xf9,
-	0x72, 0x5c, 0x45, 0xcc, 0xd7, 0xb3, 0xcc, 0x9e, 0x45, 0xde, 0x1b, 0xb8, 0x6f, 0xf6, 0x2c, 0x35,
-	0x8f, 0xf6, 0x00, 0xad, 0x92, 0xce, 0xba, 0x8d, 0xa6, 0x5a, 0x40, 0x0f, 0x60, 0x7b, 0x15, 0x7f,
-	0x6b, 0x7c, 0x50, 0x01, 0x69, 0xb0, 0x2b, 0x37, 0x46, 0x4e, 0x8d, 0x4e, 0xef, 0x7b, 0xd2, 0x35,
-	0x2d, 0xb3, 0x3b, 0xec, 0xaa, 0x45, 0xb4, 0x0b, 0x6a, 0xdb, 0x30, 0x88, 0x69, 0xf5, 0x87, 0xed,
-	0xb6, 0xd9, 0x34, 0x0d, 0x6b, 0xa0, 0x96, 0xa4, 0xe5, 0x4d, 0x07, 0x2f, 0x73, 0x81, 0xe6, 0x59,
-	0xc3, 0xb2, 0x8c, 0x0e, 0x69, 0x99, 0xfd, 0xc6, 0x69, 0xc7, 0x68, 0xa9, 0x15, 0x74, 0x00, 0x8f,
-	0x06, 0x46, 0xf7, 0xa2, 0x87, 0x1b, 0xf8, 0x03, 0x89, 0xe9, 0xed, 0x86, 0xd9, 0x19, 0x62, 0x43,
-	0xad, 0xa2, 0xaf, 0xe0, 0x00, 0x1b, 0xef, 0x86, 0x26, 0x36, 0x5a, 0xc4, 0xea, 0xb5, 0x0c, 0xd2,
-	0x36, 0x1a, 0x83, 0x21, 0x36, 0x48, 0xd7, 0xec, 0xf7, 0x4d, 0xeb, 0x3b, 0x55, 0x45, 0xcf, 0xe0,
-	0x70, 0xc1, 0xb2, 0x50, 0xb0, 0xc6, 0xb5, 0xcd, 0xcf, 0x17, 0xbb, 0xd4, 0x32, 0x7e, 0x18, 0x90,
-	0x0b, 0xc3, 0xc0, 0x2a, 0x42, 0x35, 0xd8, 0x5b, 0x9a, 0x97, 0x06, 0x22, 0xdb, 0x3b, 0x9c, 0x76,
-	0x61, 0xe0, 0x6e, 0xc3, 0xe2, 0x0e, 0x5e, 0xa1, 0xed, 0xf2, 0x6d, 0x2f, 0x69, 0xeb, 0xdb, 0x7e,
-	0x80, 0x10, 0x54, 0x12, 0x5e, 0x69, 0x37, 0xb0, 0xba, 0x87, 0xaa, 0x50, 0xec, 0x5e, 0x5c, 0x90,
-	0x81, 0xd9, 0x35, 0x7a, 0xc3, 0x81, 0xfa, 0x10, 0xed, 0x42, 0x35, 0xde, 0x52, 0x2c, 0xf9, 0xaf,
-	0x1c, 0x7a, 0x08, 0x68, 0x68, 0x61, 0xa3, 0xd1, 0xe2, 0x37, 0xb4, 0x20, 0xfc, 0x3b, 0x77, 0x9e,
-	0xce, 0x6f, 0xa9, 0x29, 0xfd, 0x1f, 0x29, 0x28, 0xaf, 0x04, 0x2a, 0x7a, 0x0c, 0x85, 0xd0, 0xb9,
-	0xf6, 0x44, 0xdd, 0x8a, 0xb2, 0xcc, 0x12, 0x10, 0x65, 0x7e, 0x62, 0x3b, 0x9e, 0x4c, 0x6f, 0xb2,
-	0x10, 0x14, 0x04, 0x22, 0x92, 0xdb, 0x3e, 0xe4, 0xe2, 0x96, 0x22, 0xb5, 0x68, 0x29, 0xb2, 0x23,
-	0xd9, 0x4a, 0x3c, 0x86, 0x02, 0xcf, 0xa1, 0x21, 0xb3, 0xa7, 0x33, 0x11, 0xf3, 0x65, 0xbc, 0x04,
-	0xd0, 0x53, 0x28, 0x4f, 0x69, 0x18, 0xda, 0xd7, 0x94, 0xc8, 0xb8, 0x05, 0xc1, 0x51, 0x8a, 0xc0,
-	0xb6, 0x08, 0xdf, 0xa7, 0x10, 0xe7, 0x91, 0x88, 0x29, 0x23, 0x99, 0x22, 0x50, 0x32, 0xad, 0xa7,
-	0x70, 0x66, 0x47, 0xe9, 0x21, 0x99, 0xc2, 0x99, 0x8d, 0x5e, 0xc0, 0xb6, 0xcc, 0x41, 0x8e, 0xe7,
-	0x4c, 0xe7, 0x53, 0x99, 0x8b, 0x72, 0x22, 0x17, 0x55, 0x45, 0x2e, 0x92, 0xb8, 0x48, 0x49, 0x8f,
-	0x20, 0x7f, 0x69, 0x87, 0x94, 0x57, 0x8f, 0x28, 0x57, 0xe4, 0xf8, 0xba, 0x4d, 0x29, 0x27, 0xf1,
-	0x9a, 0x12, 0xf0, 0x2c, 0x28, 0x53, 0x44, 0xee, 0x8a, 0x52, 0xcc, 0xef, 0x72, 0x61, 0xc1, 0xfe,
-	0xb4, 0xb4, 0x50, 0x4c, 0x58, 0x90, 0xb8, 0xb0, 0xf0, 0x02, 0xb6, 0xe9, 0x27, 0x16, 0xd8, 0xc4,
-	0x9f, 0xd9, 0x3f, 0xcd, 0x29, 0x19, 0xdb, 0xcc, 0x16, 0x3d, 0x6a, 0x09, 0x57, 0x05, 0xa1, 0x27,
-	0xf0, 0x96, 0xcd, 0x6c, 0xfd, 0x31, 0xd4, 0x30, 0x0d, 0x29, 0xeb, 0x3a, 0x61, 0xe8, 0xf8, 0x5e,
-	0xd3, 0xf7, 0x58, 0xe0, 0xbb, 0x51, 0x11, 0xd2, 0x0f, 0x60, 0x7f, 0x23, 0x55, 0x56, 0x11, 0x2e,
-	0xfc, 0x6e, 0x4e, 0x83, 0xdb, 0xcd, 0xc2, 0xef, 0x60, 0x7f, 0x23, 0x35, 0x2a, 0x41, 0x2f, 0x21,
-	0x33, 0xb3, 0x9d, 0x20, 0xd4, 0xb6, 0x44, 0x19, 0xdf, 0x5b, 0xe9, 0x1a, 0x9c, 0xe0, 0xcc, 0x09,
-	0x99, 0x1f, 0xdc, 0x62, 0xc9, 0x74, 0x9e, 0xce, 0x2b, 0xea, 0x96, 0xfe, 0x67, 0x05, 0x8a, 0x09,
-	0x22, 0x7f, 0x07, 0x9e, 0x3f, 0xa6, 0xe4, 0x2a, 0xf0, 0xa7, 0xf1, 0x0b, 0x5b, 0x00, 0x48, 0x83,
-	0x9c, 0x58, 0x30, 0x3f, 0x7a, 0x5e, 0xf1, 0x12, 0x7d, 0x03, 0xb9, 0x89, 0x54, 0x21, 0xbc, 0x54,
-	0x3c, 0xd9, 0x59, 0xb3, 0xce, 0xef, 0x06, 0xc7, 0x3c, 0xe7, 0xe9, 0x7c, 0x4a, 0x4d, 0x9f, 0xa7,
-	0xf3, 0x69, 0x35, 0x73, 0x9e, 0xce, 0x67, 0xd4, 0xec, 0x79, 0x3a, 0x9f, 0x55, 0x73, 0xfa, 0x7f,
-	0x14, 0xc8, 0xc7, 0xdc, 0x7c, 0x2f, 0x3c, 0xe7, 0x13, 0xfe, 0x32, 0xa2, 0x8e, 0x60, 0x09, 0x20,
-	0x1d, 0x4a, 0x62, 0xb1, 0xda, 0x68, 0xac, 0x60, 0xe8, 0x19, 0x94, 0x17, 0xeb, 0x45, 0x35, 0x4b,
-	0xe1, 0x55, 0x90, 0x6b, 0x0a, 0xe7, 0xa3, 0x11, 0x0d, 0x43, 0x69, 0x2a, 0x23, 0x35, 0x25, 0x31,
-	0x54, 0x87, 0x6a, 0xbc, 0x8e, 0x0d, 0x66, 0x05, 0xdb, 0x3a, 0x8c, 0x5e, 0x80, 0x9a, 0x84, 0xa6,
-	0xcb, 0x79, 0xe0, 0x0e, 0x2e, 0xaf, 0x41, 0x9f, 0xc2, 0x43, 0xe1, 0xd6, 0x8b, 0xc0, 0xbf, 0xb4,
-	0x2f, 0x1d, 0xd7, 0x61, 0xb7, 0x71, 0xcf, 0xc2, 0xaf, 0x20, 0xf0, 0xa7, 0xc4, 0x8b, 0x9b, 0x80,
-	0x12, 0x5e, 0x02, 0xdc, 0x1d, 0xcc, 0x97, 0xb4, 0xc8, 0x1d, 0xd1, 0x92, 0x77, 0x23, 0x0b, 0xe3,
-	0x29, 0x61, 0x7c, 0xb1, 0xd6, 0x6f, 0x40, 0xbb, 0x6b, 0x2e, 0x7a, 0x42, 0x87, 0x50, 0x9c, 0x2d,
-	0x61, 0x61, 0x51, 0xc1, 0x49, 0x28, 0xe9, 0xe8, 0xad, 0x5f, 0x76, 0xb4, 0xfe, 0x17, 0x05, 0xb6,
-	0x4f, 0xe7, 0x8e, 0x3b, 0x5e, 0x69, 0xc5, 0x92, 0xa3, 0x9e, 0xb2, 0x3a, 0xea, 0x6d, 0x9a, 0xe3,
-	0xb6, 0x36, 0xce, 0x71, 0x9b, 0x66, 0xa5, 0xd4, 0xbd, 0xb3, 0xd2, 0x13, 0x28, 0x2e, 0xc7, 0x24,
-	0xd9, 0xe9, 0x96, 0x30, 0x4c, 0xe2, 0x19, 0x29, 0xd4, 0xdf, 0x00, 0x4a, 0x6e, 0x34, 0xba, 0x90,
-	0x45, 0x47, 0xa8, 0xdc, 0xdb, 0x11, 0xbe, 0xf8, 0xbb, 0x02, 0xa5, 0x64, 0x5b, 0x8e, 0xca, 0x50,
-	0x30, 0x2d, 0xd2, 0xee, 0x98, 0xdf, 0x9d, 0x0d, 0xd4, 0x2f, 0xf8, 0xb2, 0x3f, 0x6c, 0x36, 0x0d,
-	0xa3, 0x65, 0xb4, 0x54, 0x85, 0x17, 0x0c, 0x9e, 0xea, 0x8d, 0xd6, 0xa2, 0x3e, 0x6c, 0xf1, 0xd2,
-	0x1e, 0x61, 0x56, 0x8f, 0xe0, 0xde, 0x70, 0x60, 0xa8, 0x29, 0xa4, 0x42, 0x29, 0x02, 0x0d, 0x8c,
-	0x7b, 0x58, 0x4d, 0xf3, 0xfa, 0x17, 0x21, 0x77, 0xdb, 0x92, 0xb8, 0x6b, 0xc9, 0x88, 0xb6, 0x23,
-	0xe6, 0x5a, 0x56, 0x6c, 0x72, 0xda, 0xe8, 0x34, 0xac, 0xa6, 0xa1, 0x66, 0x4f, 0xfe, 0x96, 0x81,
-	0xac, 0x38, 0x41, 0x80, 0xce, 0xa0, 0x98, 0x98, 0xd0, 0xd0, 0xc1, 0x67, 0x27, 0xb7, 0x9a, 0xb6,
-	0x79, 0x10, 0x99, 0x87, 0xaf, 0x14, 0x74, 0x0e, 0xa5, 0xe4, 0xfc, 0x83, 0x92, 0xcd, 0xea, 0x86,
-	0xc1, 0xe8, 0xb3, 0xba, 0xde, 0x82, 0x6a, 0x84, 0xcc, 0x99, 0xf2, 0xe6, 0x34, 0x1a, 0x17, 0x50,
-	0x2d, 0xc1, 0xbf, 0x36, 0x83, 0xd4, 0xf6, 0x37, 0xd2, 0x22, 0x17, 0x76, 0xe4, 0x11, 0xa3, 0x86,
-	0xfd, 0xce, 0x11, 0x57, 0xa7, 0x84, 0xda, 0x97, 0xf7, 0x91, 0x23, 0x6d, 0x63, 0xd8, 0xd9, 0x90,
-	0xc0, 0xd1, 0xaf, 0x92, 0x3b, 0xb8, 0x37, 0xfd, 0xd7, 0x9e, 0xff, 0x12, 0xdb, 0xd2, 0xca, 0x86,
-	0x4c, 0xbf, 0x62, 0xe5, 0xfe, 0x3a, 0xb1, 0x62, 0xe5, 0x73, 0x05, 0xe3, 0x47, 0x50, 0xd7, 0x33,
-	0x01, 0xd2, 0xd7, 0x65, 0xef, 0x66, 0xa5, 0xda, 0xd3, 0xcf, 0xf2, 0x44, 0xca, 0x4d, 0x80, 0x65,
-	0x3c, 0xa1, 0xc7, 0x09, 0x91, 0x3b, 0xf9, 0xa0, 0x76, 0x70, 0x0f, 0x55, 0xaa, 0x3a, 0xfd, 0xf5,
-	0x1f, 0x8f, 0xaf, 0x1d, 0x36, 0x99, 0x5f, 0x1e, 0x8d, 0xfc, 0xe9, 0xb1, 0xcb, 0x5b, 0x7c, 0xcf,
-	0xf1, 0xae, 0x3d, 0xca, 0x7e, 0xf6, 0x83, 0x9b, 0x63, 0xd7, 0x1b, 0x1f, 0x8b, 0xb0, 0x3c, 0x5e,
-	0x68, 0xb9, 0xcc, 0x8a, 0x3f, 0xa4, 0x7e, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0xf6,
-	0xab, 0x74, 0xc0, 0x12, 0x00, 0x00,
+	// 2719 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x59, 0xcf, 0x73, 0x1a, 0xc9,
+	0xf5, 0x37, 0x02, 0x04, 0x3c, 0x7e, 0xb5, 0x5a, 0xb2, 0x8c, 0x91, 0xbd, 0xab, 0x65, 0xfd, 0xf5,
+	0xaa, 0x5c, 0x5e, 0xdb, 0x5f, 0x25, 0xbb, 0xb5, 0x95, 0xda, 0xda, 0x0d, 0x82, 0xc1, 0x1a, 0x19,
+	0x66, 0xd8, 0x06, 0x64, 0x3b, 0x7b, 0xe8, 0x1a, 0x41, 0x4b, 0x4c, 0x09, 0x66, 0xd8, 0x99, 0xc6,
+	0xb6, 0x8e, 0xa9, 0x54, 0xe5, 0x94, 0xff, 0x23, 0x39, 0xa4, 0x72, 0xc9, 0x79, 0xff, 0x9d, 0xe4,
+	0x9e, 0x5b, 0x6e, 0xa9, 0xee, 0x9e, 0x81, 0x19, 0x40, 0xde, 0xbd, 0xd8, 0xf4, 0xe7, 0xfd, 0xe8,
+	0xd7, 0xef, 0xf5, 0x7b, 0xfd, 0xde, 0x08, 0xf6, 0x3d, 0x77, 0xce, 0x99, 0xe7, 0xcd, 0x86, 0xcf,
+	0xd5, 0xaf, 0x67, 0x33, 0xcf, 0xe5, 0x2e, 0xce, 0x2d, 0xf0, 0x6a, 0xce, 0x9b, 0x0d, 0x15, 0x5a,
+	0xfb, 0x6f, 0x1a, 0x70, 0x8f, 0x39, 0xa3, 0xae, 0x75, 0x33, 0x65, 0x0e, 0x27, 0xec, 0xa7, 0x39,
+	0xf3, 0x39, 0xc6, 0x90, 0x1a, 0x31, 0x9f, 0x57, 0x12, 0x87, 0x89, 0xa3, 0x02, 0x91, 0xbf, 0x31,
+	0x82, 0xa4, 0x35, 0xe5, 0x95, 0xad, 0xc3, 0xc4, 0x51, 0x92, 0x88, 0x9f, 0xf8, 0x3e, 0x64, 0xad,
+	0x29, 0xa7, 0x53, 0xdf, 0xe2, 0x95, 0x82, 0x84, 0x33, 0xd6, 0x94, 0x77, 0x7c, 0x8b, 0xe3, 0xcf,
+	0xa0, 0x30, 0x53, 0x2a, 0xe9, 0xd8, 0xf2, 0xc7, 0x95, 0xa4, 0x54, 0x94, 0x0f, 0xb0, 0x53, 0xcb,
+	0x1f, 0xe3, 0x23, 0x40, 0x97, 0xb6, 0x63, 0x4d, 0xe8, 0x70, 0xc2, 0xdf, 0xd1, 0x11, 0x9b, 0x70,
+	0xab, 0x92, 0x3a, 0x4c, 0x1c, 0xa5, 0x49, 0x49, 0xe2, 0x8d, 0x09, 0x7f, 0xd7, 0x14, 0x28, 0xfe,
+	0x02, 0xca, 0xa1, 0x32, 0x4f, 0x19, 0x58, 0x49, 0x1f, 0x26, 0x8e, 0x72, 0xa4, 0x34, 0x8b, 0x9b,
+	0xfd, 0x05, 0x94, 0xb9, 0x3d, 0x65, 0xee, 0x9c, 0x53, 0x9f, 0x0d, 0x5d, 0x67, 0xe4, 0x57, 0xb6,
+	0x95, 0xc6, 0x00, 0xee, 0x29, 0x14, 0xd7, 0xa0, 0x78, 0xc9, 0x18, 0x9d, 0xd8, 0x53, 0x9b, 0x53,
+	0x61, 0x7e, 0x46, 0x9a, 0x9f, 0xbf, 0x64, 0xac, 0x2d, 0xb0, 0x9e, 0xc5, 0xf1, 0x23, 0x28, 0x2d,
+	0x79, 0xe4, 0x19, 0x8b, 0x92, 0xa9, 0x10, 0x32, 0xc9, 0x83, 0x3e, 0x05, 0xe4, 0xce, 0xf9, 0x95,
+	0x6b, 0x3b, 0x57, 0x74, 0x38, 0xb6, 0x1c, 0x6a, 0x8f, 0x2a, 0xd9, 0xc3, 0xc4, 0x51, 0xea, 0x64,
+	0xeb, 0x45, 0x82, 0x94, 0x42, 0x5a, 0x63, 0x6c, 0x39, 0xfa, 0x08, 0x3f, 0x86, 0xf2, 0xc4, 0xf2,
+	0x39, 0x1d, 0xbb, 0x33, 0x3a, 0x9b, 0x5f, 0x5c, 0xb3, 0x9b, 0x4a, 0x49, 0x7a, 0xa6, 0x28, 0xe0,
+	0x53, 0x77, 0xd6, 0x95, 0x20, 0x7e, 0x08, 0x20, 0xbd, 0x22, 0x37, 0xaf, 0xe4, 0xe4, 0x19, 0x72,
+	0x02, 0x91, 0x1b, 0xe3, 0x63, 0xc8, 0xcb, 0x68, 0xd2, 0xb1, 0xed, 0x70, 0xbf, 0x02, 0x87, 0xc9,
+	0xa3, 0xfc, 0x31, 0x7a, 0x36, 0x71, 0x44, 0x60, 0x89, 0xa0, 0x9c, 0xda, 0x0e, 0x27, 0x51, 0x26,
+	0x3c, 0x82, 0x5d, 0x11, 0x46, 0x3a, 0x9c, 0xfb, 0xdc, 0x9d, 0x52, 0x8f, 0x0d, 0x5d, 0x6f, 0xe4,
+	0x57, 0xf2, 0x52, 0xf6, 0xb7, 0xcf, 0x16, 0xb7, 0xe3, 0xd9, 0xfa, 0x75, 0x78, 0xd6, 0x64, 0x3e,
+	0x6f, 0x48, 0x39, 0xa2, 0xc4, 0x34, 0x87, 0x7b, 0x37, 0x64, 0x67, 0xb4, 0x8a, 0xe3, 0xa7, 0x80,
+	0xad, 0xc9, 0xc4, 0x7d, 0x4f, 0x7d, 0x36, 0xb9, 0xa4, 0x41, 0x78, 0x2a, 0xe5, 0xc3, 0xc4, 0x51,
+	0x96, 0x20, 0x49, 0xe9, 0xb1, 0xc9, 0x65, 0xa0, 0x1e, 0x7f, 0x0d, 0x45, 0x69, 0xd3, 0x25, 0xb3,
+	0xf8, 0xdc, 0x63, 0x7e, 0x05, 0x1d, 0x26, 0x8f, 0x4a, 0xc7, 0x3b, 0xc1, 0x49, 0x5a, 0x0a, 0x3e,
+	0xb1, 0x39, 0x29, 0x08, 0xbe, 0x60, 0xed, 0x57, 0x9b, 0xb0, 0xbf, 0xd9, 0x24, 0x71, 0x49, 0x85,
+	0x53, 0xc5, 0xbd, 0x4d, 0x11, 0xf1, 0x13, 0xef, 0x41, 0xfa, 0x9d, 0x35, 0x99, 0x33, 0x79, 0x71,
+	0x0b, 0x44, 0x2d, 0x7e, 0xb7, 0xf5, 0x4d, 0xa2, 0xf6, 0x0d, 0xec, 0xf6, 0x3d, 0x6b, 0x78, 0xbd,
+	0x72, 0xf7, 0x57, 0xaf, 0x6e, 0x62, 0xed, 0xea, 0xd6, 0xfe, 0x96, 0x80, 0x62, 0x20, 0xd5, 0xe3,
+	0x16, 0x9f, 0xfb, 0xf8, 0x4b, 0x48, 0xfb, 0xdc, 0xe2, 0x4c, 0x72, 0x97, 0x8e, 0xef, 0x45, 0xfc,
+	0x19, 0x61, 0x64, 0x44, 0x71, 0xe1, 0x2a, 0x64, 0x67, 0x1e, 0xb3, 0xa7, 0xd6, 0x55, 0x68, 0xd7,
+	0x62, 0x8d, 0x6b, 0x90, 0x96, 0xc2, 0x32, 0x67, 0xf2, 0xc7, 0x85, 0x68, 0x58, 0x89, 0x22, 0xe1,
+	0x23, 0x48, 0x8f, 0xf9, 0x64, 0xe8, 0x57, 0x52, 0x32, 0x7c, 0x38, 0xe0, 0x39, 0xed, 0xb7, 0x1b,
+	0x75, 0xce, 0xd9, 0x74, 0xc6, 0x89, 0x62, 0xa8, 0x7d, 0x07, 0x65, 0x29, 0xd9, 0x62, 0xec, 0x63,
+	0xc9, 0x7d, 0x0f, 0x44, 0xea, 0xca, 0x54, 0x50, 0x09, 0xbe, 0x6d, 0x4d, 0x45, 0x16, 0xd4, 0x46,
+	0x80, 0x96, 0xf2, 0xfe, 0xcc, 0x75, 0x7c, 0xb1, 0x3b, 0x12, 0x66, 0x88, 0x2b, 0x2f, 0x32, 0x44,
+	0xe6, 0x46, 0x42, 0x4a, 0x95, 0x02, 0xbc, 0xc5, 0x98, 0xcc, 0x8e, 0xc7, 0x2a, 0x21, 0xe9, 0xc4,
+	0x1d, 0x5e, 0x8b, 0x14, 0xb7, 0x6e, 0x02, 0xf5, 0x45, 0x01, 0xb7, 0xdd, 0xe1, 0x75, 0x53, 0x80,
+	0xb5, 0x1f, 0x55, 0x15, 0xea, 0xbb, 0xea, 0x94, 0xbf, 0x3a, 0x12, 0x4b, 0x67, 0x6d, 0xdd, 0xea,
+	0xac, 0x1a, 0x85, 0xdd, 0x98, 0xf2, 0xe0, 0x14, 0xd1, 0x18, 0x24, 0x56, 0x62, 0xf0, 0x14, 0x32,
+	0x97, 0x96, 0x3d, 0x99, 0x7b, 0xa1, 0x62, 0x1c, 0x09, 0x68, 0x4b, 0x51, 0x48, 0xc8, 0x52, 0xfb,
+	0x73, 0x16, 0x32, 0x01, 0x88, 0x8f, 0x21, 0x35, 0x74, 0x47, 0xe1, 0x3d, 0xf8, 0x64, 0x5d, 0x2c,
+	0xfc, 0xbf, 0xe1, 0x8e, 0x18, 0x91, 0xbc, 0xf8, 0x7b, 0x28, 0x89, 0xd2, 0xe1, 0xb0, 0x09, 0x9d,
+	0xcf, 0x46, 0xd6, 0x22, 0xf4, 0x95, 0x88, 0x74, 0x43, 0x31, 0x0c, 0x24, 0x9d, 0x14, 0x87, 0xd1,
+	0x25, 0x3e, 0x80, 0x9c, 0x88, 0xb6, 0x8a, 0x44, 0x4a, 0xde, 0xfd, 0xac, 0x00, 0x64, 0x0c, 0x6a,
+	0x50, 0x74, 0x1d, 0xdb, 0x75, 0xa8, 0x3f, 0xb6, 0xe8, 0xf1, 0x57, 0x5f, 0xcb, 0xda, 0x59, 0x20,
+	0x79, 0x09, 0xf6, 0xc6, 0xd6, 0xf1, 0x57, 0x5f, 0xe3, 0x4f, 0x21, 0x2f, 0xeb, 0x0d, 0xfb, 0x30,
+	0xb3, 0xbd, 0x1b, 0x59, 0x34, 0x8b, 0x44, 0x96, 0x20, 0x4d, 0x22, 0x22, 0x8b, 0x2e, 0x27, 0xd6,
+	0x95, 0x2f, 0x0b, 0x65, 0x91, 0xa8, 0x05, 0x7e, 0x01, 0x7b, 0x81, 0x0f, 0xa8, 0xef, 0xce, 0xbd,
+	0x21, 0xa3, 0xb6, 0x33, 0x62, 0x1f, 0x64, 0x01, 0x2c, 0x12, 0x1c, 0xd0, 0x7a, 0x92, 0xa4, 0x0b,
+	0x0a, 0xde, 0x87, 0xed, 0x31, 0xb3, 0xaf, 0xc6, 0xaa, 0xa8, 0x15, 0x49, 0xb0, 0xaa, 0xfd, 0x9c,
+	0x86, 0x7c, 0xc4, 0x31, 0xb8, 0x00, 0x59, 0xa2, 0xf5, 0x34, 0x72, 0xae, 0x35, 0xd1, 0x1d, 0x7c,
+	0x04, 0x8f, 0x74, 0xa3, 0x61, 0x12, 0xa2, 0x35, 0xfa, 0xd4, 0x24, 0x74, 0x60, 0xbc, 0x32, 0xcc,
+	0xd7, 0x06, 0xed, 0xd6, 0xdf, 0x76, 0x34, 0xa3, 0x4f, 0x9b, 0x5a, 0xbf, 0xae, 0xb7, 0x7b, 0x28,
+	0x81, 0x1f, 0x40, 0x65, 0xc9, 0x19, 0x92, 0xeb, 0x1d, 0x73, 0x60, 0xf4, 0xd1, 0x16, 0xfe, 0x14,
+	0x0e, 0x5a, 0xba, 0x51, 0x6f, 0xd3, 0x25, 0x4f, 0xa3, 0xdd, 0x3f, 0xa7, 0xda, 0x9b, 0xae, 0x4e,
+	0xde, 0xa2, 0xe4, 0x26, 0x06, 0x91, 0x53, 0xa1, 0x86, 0x14, 0xbe, 0x0f, 0x77, 0x15, 0x83, 0x12,
+	0xa1, 0x7d, 0xd3, 0xa4, 0x3d, 0xd3, 0x34, 0x50, 0x1a, 0xef, 0x40, 0x51, 0x37, 0xce, 0xeb, 0x6d,
+	0xbd, 0x49, 0x89, 0x56, 0x6f, 0x77, 0xd0, 0x36, 0xde, 0x85, 0xf2, 0x2a, 0x5f, 0x46, 0xa8, 0x08,
+	0xf9, 0x4c, 0x43, 0x37, 0x0d, 0x7a, 0xae, 0x91, 0x9e, 0x6e, 0x1a, 0x28, 0x8b, 0xf7, 0x01, 0xc7,
+	0x49, 0xa7, 0x9d, 0x7a, 0x03, 0xe5, 0xf0, 0x5d, 0xd8, 0x89, 0xe3, 0xaf, 0xb4, 0xb7, 0x08, 0x70,
+	0x05, 0xf6, 0x94, 0x61, 0xf4, 0x44, 0x6b, 0x9b, 0xaf, 0x69, 0x47, 0x37, 0xf4, 0xce, 0xa0, 0x83,
+	0xf2, 0x78, 0x0f, 0x50, 0x4b, 0xd3, 0xa8, 0x6e, 0xf4, 0x06, 0xad, 0x96, 0xde, 0xd0, 0x35, 0xa3,
+	0x8f, 0x0a, 0x6a, 0xe7, 0x4d, 0x07, 0x2f, 0x0a, 0x81, 0xc6, 0x69, 0xdd, 0x30, 0xb4, 0x36, 0x6d,
+	0xea, 0xbd, 0xfa, 0x49, 0x5b, 0x6b, 0xa2, 0x12, 0x7e, 0x08, 0xf7, 0xfb, 0x5a, 0xa7, 0x6b, 0x92,
+	0x3a, 0x79, 0x4b, 0x43, 0x7a, 0xab, 0xae, 0xb7, 0x07, 0x44, 0x43, 0x65, 0xfc, 0x19, 0x3c, 0x24,
+	0xda, 0x0f, 0x03, 0x9d, 0x68, 0x4d, 0x6a, 0x98, 0x4d, 0x8d, 0xb6, 0xb4, 0x7a, 0x7f, 0x40, 0x34,
+	0xda, 0xd1, 0x7b, 0x3d, 0xdd, 0x78, 0x89, 0x10, 0x7e, 0x04, 0x87, 0x0b, 0x96, 0x85, 0x82, 0x15,
+	0xae, 0x1d, 0x71, 0xbe, 0x30, 0xa4, 0x86, 0xf6, 0xa6, 0x4f, 0xbb, 0x9a, 0x46, 0x10, 0xc6, 0x55,
+	0xd8, 0x5f, 0x6e, 0xaf, 0x36, 0x08, 0xf6, 0xde, 0x15, 0xb4, 0xae, 0x46, 0x3a, 0x75, 0x43, 0x04,
+	0x38, 0x46, 0xdb, 0x13, 0x66, 0x2f, 0x69, 0xab, 0x66, 0xdf, 0xc5, 0x18, 0x4a, 0x91, 0xa8, 0xb4,
+	0xea, 0x04, 0xed, 0xe3, 0x32, 0xe4, 0x3b, 0xdd, 0x2e, 0xed, 0xeb, 0x1d, 0xcd, 0x1c, 0xf4, 0xd1,
+	0x3d, 0xbc, 0x07, 0xe5, 0xd0, 0xa4, 0x50, 0xf2, 0x5f, 0x19, 0x7c, 0x0f, 0xf0, 0xc0, 0x20, 0x5a,
+	0xbd, 0x29, 0x3c, 0xb4, 0x20, 0xfc, 0x3b, 0x73, 0x96, 0xca, 0x6e, 0xa1, 0x64, 0xed, 0x9f, 0x49,
+	0x28, 0xc6, 0x12, 0x15, 0x3f, 0x80, 0x9c, 0x6f, 0x5f, 0x39, 0xf2, 0xdd, 0x0a, 0xaa, 0xcc, 0x12,
+	0x90, 0xcf, 0xfc, 0xd8, 0xb2, 0x1d, 0x55, 0xde, 0xd4, 0x43, 0x90, 0x93, 0x88, 0x2c, 0x6e, 0x07,
+	0x90, 0x09, 0x5b, 0x8a, 0xe4, 0xa2, 0xa5, 0xd8, 0x1e, 0xaa, 0x56, 0xe2, 0x01, 0xe4, 0x44, 0x0d,
+	0xf5, 0xb9, 0x35, 0x9d, 0xc9, 0x9c, 0x2f, 0x92, 0x25, 0x80, 0x3f, 0x87, 0xe2, 0x94, 0xf9, 0xbe,
+	0x75, 0xc5, 0xa8, 0xca, 0x5b, 0x90, 0x1c, 0x85, 0x00, 0x6c, 0xc9, 0xf4, 0xfd, 0x1c, 0xc2, 0x3a,
+	0x12, 0x30, 0xa5, 0x15, 0x53, 0x00, 0x2a, 0xa6, 0xd5, 0x12, 0xce, 0xad, 0xa0, 0x3c, 0x44, 0x4b,
+	0x38, 0xb7, 0xf0, 0x13, 0xd8, 0x51, 0x35, 0xc8, 0x76, 0xec, 0xe9, 0x7c, 0xaa, 0x6a, 0x51, 0x46,
+	0xd6, 0xa2, 0xb2, 0xac, 0x45, 0x0a, 0x97, 0x25, 0xe9, 0x3e, 0x64, 0x2f, 0x2c, 0x9f, 0x89, 0xd7,
+	0x23, 0xa8, 0x15, 0x19, 0xb1, 0x6e, 0x31, 0x26, 0x48, 0xe2, 0x4d, 0xf1, 0x44, 0x15, 0x54, 0x25,
+	0x22, 0x73, 0xc9, 0x18, 0x11, 0xbe, 0x5c, 0xec, 0x60, 0x7d, 0x58, 0xee, 0x90, 0x8f, 0xec, 0xa0,
+	0x70, 0xb9, 0xc3, 0x13, 0xd8, 0x61, 0x1f, 0xb8, 0x67, 0x51, 0x77, 0x66, 0xfd, 0x34, 0x67, 0x74,
+	0x64, 0x71, 0x4b, 0xf6, 0xa8, 0x05, 0x52, 0x96, 0x04, 0x53, 0xe2, 0x4d, 0x8b, 0x5b, 0xb5, 0x07,
+	0x50, 0x25, 0xcc, 0x67, 0xbc, 0x63, 0xfb, 0xbe, 0xed, 0x3a, 0x0d, 0xd7, 0xe1, 0x9e, 0x3b, 0x09,
+	0x1e, 0xa1, 0xda, 0x43, 0x38, 0xd8, 0x48, 0x55, 0xaf, 0x88, 0x10, 0xfe, 0x61, 0xce, 0xbc, 0x9b,
+	0xcd, 0xc2, 0x3f, 0xc0, 0xc1, 0x46, 0x6a, 0xf0, 0x04, 0x3d, 0x85, 0xf4, 0xcc, 0xb2, 0x3d, 0xbf,
+	0xb2, 0x25, 0x9f, 0xf1, 0xfd, 0x58, 0xd7, 0x60, 0x7b, 0xa7, 0xb6, 0xcf, 0x5d, 0xef, 0x86, 0x28,
+	0xa6, 0xb3, 0x54, 0x36, 0x81, 0xb6, 0x6a, 0x7f, 0x49, 0x40, 0x3e, 0x42, 0x14, 0xf7, 0xc0, 0x71,
+	0x47, 0x8c, 0x5e, 0x7a, 0xee, 0x34, 0xbc, 0x61, 0x0b, 0x00, 0x57, 0x20, 0x23, 0x17, 0xdc, 0x0d,
+	0xae, 0x57, 0xb8, 0xc4, 0x5f, 0x42, 0x66, 0xac, 0x54, 0xc8, 0x28, 0xe5, 0x8f, 0x77, 0x57, 0x76,
+	0x17, 0xbe, 0x21, 0x21, 0xcf, 0x59, 0x2a, 0x9b, 0x44, 0xa9, 0xb3, 0x54, 0x36, 0x85, 0xd2, 0x67,
+	0xa9, 0x6c, 0x1a, 0x6d, 0x9f, 0xa5, 0xb2, 0xdb, 0x28, 0x53, 0xfb, 0x4f, 0x02, 0xb2, 0x21, 0xb7,
+	0xb0, 0x45, 0xd4, 0x7c, 0x2a, 0x6e, 0x46, 0xd0, 0x11, 0x2c, 0x01, 0x5c, 0x83, 0x82, 0x5c, 0xc4,
+	0x1b, 0x8d, 0x18, 0x86, 0x1f, 0x41, 0x71, 0xb1, 0x5e, 0xbc, 0x66, 0x49, 0x12, 0x07, 0x85, 0x26,
+	0x7f, 0x3e, 0x1c, 0x32, 0xdf, 0x57, 0x5b, 0xa5, 0x95, 0xa6, 0x28, 0x86, 0x8f, 0xa0, 0x1c, 0xae,
+	0xc3, 0x0d, 0xb7, 0x25, 0xdb, 0x2a, 0x8c, 0x9f, 0x00, 0x8a, 0x42, 0xd3, 0xe5, 0x3c, 0xb0, 0x86,
+	0x2b, 0x37, 0xd4, 0xa6, 0x70, 0x4f, 0x86, 0xb5, 0xeb, 0xb9, 0x17, 0xd6, 0x85, 0x3d, 0xb1, 0xf9,
+	0x4d, 0xd8, 0xb3, 0x08, 0x17, 0x78, 0xee, 0x94, 0x3a, 0x61, 0x13, 0x50, 0x20, 0x4b, 0x40, 0x84,
+	0x83, 0xbb, 0x8a, 0x16, 0x84, 0x23, 0x58, 0x8a, 0x6e, 0x64, 0xb1, 0x79, 0x52, 0x6e, 0xbe, 0x58,
+	0xd7, 0xae, 0xa1, 0xb2, 0xbe, 0x5d, 0x70, 0x85, 0x0e, 0x21, 0x3f, 0x5b, 0xc2, 0x72, 0xc7, 0x04,
+	0x89, 0x42, 0xd1, 0x40, 0x6f, 0xfd, 0x72, 0xa0, 0x6b, 0x7f, 0x4d, 0xc0, 0xce, 0xc9, 0xdc, 0x9e,
+	0x8c, 0x62, 0xad, 0x58, 0x74, 0xd4, 0x4b, 0xc4, 0x47, 0xbd, 0x4d, 0x73, 0xdc, 0xd6, 0xc6, 0x39,
+	0x6e, 0xd3, 0xac, 0x94, 0xbc, 0x75, 0x56, 0xfa, 0x14, 0xf2, 0xcb, 0x31, 0x49, 0x75, 0xba, 0x05,
+	0x02, 0xe3, 0x70, 0x46, 0xf2, 0x6b, 0xdf, 0x00, 0x8e, 0x1a, 0x1a, 0x38, 0x64, 0xd1, 0x11, 0x26,
+	0x6e, 0xef, 0x08, 0x1f, 0x40, 0xb5, 0x37, 0xbf, 0xf0, 0x87, 0x9e, 0x7d, 0xc1, 0x4e, 0xf9, 0x64,
+	0xa8, 0xbd, 0x63, 0x0e, 0xf7, 0xc3, 0xa4, 0xfd, 0xfb, 0x36, 0xe4, 0x16, 0xa8, 0xb8, 0x1d, 0xb6,
+	0x33, 0x74, 0xa7, 0xa1, 0xd1, 0x0e, 0x9b, 0x04, 0xe3, 0xc5, 0x1a, 0x2e, 0x78, 0x63, 0x07, 0x14,
+	0xbc, 0x5b, 0x8a, 0x77, 0x15, 0x8f, 0xe9, 0x95, 0x65, 0x2d, 0x74, 0x06, 0x59, 0xc3, 0x63, 0x7a,
+	0x43, 0xde, 0xd4, 0x8a, 0xde, 0x90, 0xf7, 0x29, 0xec, 0x2c, 0xe4, 0x45, 0x22, 0x88, 0xba, 0x1d,
+	0x14, 0xf6, 0x75, 0x82, 0xe0, 0x5e, 0x68, 0x58, 0x70, 0xab, 0xfa, 0xbe, 0x4e, 0x88, 0xe9, 0x8e,
+	0xa5, 0x4a, 0x8a, 0xac, 0x13, 0x62, 0xba, 0x17, 0xdc, 0x59, 0xc5, 0xbd, 0x46, 0x88, 0xbf, 0x67,
+	0x39, 0xc9, 0x15, 0x79, 0xcf, 0xbe, 0x03, 0x60, 0x22, 0x1c, 0x94, 0xdf, 0xcc, 0x98, 0x7c, 0xcc,
+	0xe2, 0xcd, 0xf5, 0x22, 0x5e, 0xcf, 0xe4, 0xbf, 0xfd, 0x9b, 0x19, 0x23, 0x11, 0x09, 0xfc, 0x3d,
+	0x14, 0x2f, 0x5d, 0xef, 0xbd, 0xe5, 0x8d, 0xa8, 0x44, 0xe5, 0xbb, 0x91, 0x8f, 0xcd, 0x69, 0x2d,
+	0x45, 0x97, 0xf2, 0xa7, 0x77, 0x48, 0x9c, 0x1f, 0x77, 0x00, 0x87, 0x80, 0xac, 0x45, 0x4a, 0x4b,
+	0x41, 0x6a, 0x39, 0x58, 0xd7, 0x22, 0x7a, 0xd9, 0x50, 0xd3, 0x06, 0x41, 0xfc, 0x2d, 0x14, 0x7c,
+	0xc6, 0xf9, 0x84, 0x05, 0x8a, 0x8a, 0x52, 0xd1, 0x7e, 0x6c, 0x0c, 0x17, 0xe4, 0x50, 0x47, 0x8c,
+	0x1b, 0x37, 0xa1, 0x3c, 0xb1, 0x9d, 0xeb, 0xa8, 0x25, 0xa5, 0xb5, 0x89, 0xa1, 0x6d, 0x3b, 0xd7,
+	0x51, 0x33, 0x56, 0x45, 0x6a, 0xdf, 0x42, 0x6e, 0xe1, 0x2c, 0x9c, 0x87, 0x4c, 0xd0, 0xef, 0xa0,
+	0x3b, 0x38, 0x0b, 0xa9, 0x9e, 0x66, 0x34, 0x51, 0x42, 0xc0, 0x44, 0x6b, 0x68, 0xfa, 0xb9, 0x86,
+	0xb6, 0xc4, 0xa2, 0x65, 0x92, 0xd7, 0x75, 0xd2, 0x44, 0xc9, 0x93, 0x0c, 0xa4, 0x95, 0x9a, 0x12,
+	0x14, 0xa2, 0xae, 0xab, 0x61, 0x40, 0xab, 0x4e, 0xa8, 0x15, 0x21, 0x1f, 0x39, 0x4f, 0xed, 0xe7,
+	0x04, 0x14, 0x63, 0xe6, 0xe1, 0x13, 0x28, 0xbc, 0xb7, 0x3d, 0x46, 0xc3, 0xa9, 0xeb, 0xd7, 0x8d,
+	0x4f, 0x31, 0x19, 0xfc, 0x7b, 0x28, 0x85, 0xd3, 0xc8, 0x88, 0x71, 0xcb, 0x56, 0xb9, 0x57, 0x8a,
+	0x39, 0x25, 0x90, 0x6e, 0x4a, 0x3a, 0x59, 0xe1, 0xc7, 0x8f, 0x97, 0x1a, 0x7c, 0xee, 0xd9, 0xce,
+	0x95, 0xcc, 0xc8, 0x1c, 0x59, 0x41, 0x9f, 0xfc, 0x23, 0x01, 0x85, 0xe8, 0x58, 0x8f, 0x8b, 0x90,
+	0xd3, 0x0d, 0xda, 0x6a, 0xeb, 0x2f, 0x4f, 0xfb, 0xe8, 0x8e, 0x58, 0xf6, 0x06, 0x8d, 0x86, 0xa6,
+	0x35, 0x35, 0xe1, 0x44, 0x0c, 0x25, 0xd1, 0x2a, 0x6a, 0xcd, 0x45, 0x7f, 0xb9, 0x25, 0x46, 0x83,
+	0x00, 0x33, 0x4c, 0x4a, 0xcc, 0x41, 0x5f, 0x43, 0x49, 0x8c, 0xa0, 0x10, 0x80, 0x1a, 0x21, 0x26,
+	0x41, 0x29, 0xd1, 0x3f, 0x07, 0xc8, 0xfa, 0x58, 0x13, 0x4e, 0x3d, 0x69, 0x39, 0xb6, 0x84, 0x5c,
+	0xcb, 0x8e, 0x9f, 0x9e, 0xd4, 0xdb, 0x75, 0xa3, 0xa1, 0xa1, 0xed, 0x27, 0x7f, 0x4c, 0x41, 0x31,
+	0x76, 0xf4, 0x78, 0xbc, 0x8b, 0x90, 0x33, 0xcc, 0x40, 0x1f, 0x4a, 0x08, 0x33, 0xd4, 0x98, 0xd1,
+	0xd4, 0x1a, 0x66, 0x53, 0x44, 0xfe, 0x2e, 0xec, 0xb4, 0x75, 0xe3, 0x15, 0x35, 0xcc, 0x3e, 0xd5,
+	0xda, 0xfa, 0x4b, 0xfd, 0xa4, 0x2d, 0xec, 0xdd, 0x03, 0x64, 0x1a, 0xa2, 0xc3, 0xd6, 0x8d, 0xc5,
+	0xd1, 0x52, 0x02, 0x95, 0x43, 0x93, 0xf6, 0x46, 0x78, 0xa0, 0x47, 0x3b, 0xf5, 0x37, 0x28, 0x2d,
+	0x86, 0x95, 0xcd, 0xc6, 0xa9, 0xa9, 0xa7, 0x61, 0x76, 0xba, 0x6d, 0xad, 0xaf, 0xd1, 0xf0, 0x86,
+	0x65, 0x84, 0x8b, 0xd4, 0xf0, 0xd5, 0x6c, 0x52, 0x75, 0x3c, 0x94, 0x15, 0x96, 0x04, 0x1c, 0xbd,
+	0xe5, 0xa4, 0x92, 0x13, 0x7b, 0xea, 0xc6, 0xb9, 0xa9, 0x37, 0x34, 0xda, 0x10, 0x6a, 0x05, 0x0a,
+	0xc1, 0xdc, 0x24, 0xd1, 0x81, 0xd1, 0xd4, 0x48, 0xb7, 0xae, 0x37, 0x51, 0x1e, 0x1f, 0xc0, 0xbd,
+	0x10, 0x5e, 0x1d, 0xcf, 0x0a, 0x51, 0x4d, 0xe2, 0xb4, 0x66, 0x57, 0x33, 0x50, 0x11, 0xdf, 0x83,
+	0x5d, 0x31, 0x1f, 0x84, 0x94, 0xf0, 0xb0, 0x25, 0xc1, 0x5e, 0x6f, 0x36, 0x89, 0xd6, 0xeb, 0x89,
+	0x79, 0xa6, 0x53, 0xef, 0x37, 0x4e, 0x51, 0x59, 0x1c, 0xa9, 0xa7, 0xf5, 0x69, 0xdf, 0xec, 0xd7,
+	0xdb, 0x4b, 0x1c, 0x09, 0x83, 0x96, 0xb8, 0xd8, 0xb4, 0x6d, 0xbe, 0x46, 0x3b, 0xc2, 0xe1, 0x02,
+	0x36, 0xcf, 0x03, 0x13, 0xb1, 0x38, 0x7b, 0x38, 0x7e, 0x04, 0x7b, 0xa2, 0x5d, 0x01, 0x86, 0x63,
+	0xe0, 0x2b, 0xed, 0xad, 0xcc, 0xd0, 0x3d, 0x01, 0x2a, 0xcb, 0x68, 0x97, 0x98, 0x2f, 0x85, 0x21,
+	0x6a, 0xc4, 0x69, 0xe8, 0xa4, 0x31, 0x68, 0xd7, 0x49, 0x70, 0xb9, 0xf6, 0x8f, 0xff, 0xb4, 0x0d,
+	0xdb, 0xf2, 0x15, 0xf4, 0xf0, 0xa9, 0x48, 0xc7, 0xc5, 0x57, 0x3e, 0xfc, 0xf0, 0xa3, 0x5f, 0xff,
+	0xaa, 0x95, 0xcd, 0x1f, 0xb3, 0xe6, 0xfe, 0x8b, 0x04, 0x3e, 0x83, 0x42, 0xf4, 0x1b, 0x1a, 0x8e,
+	0x66, 0xec, 0x86, 0x8f, 0x6b, 0x1f, 0xd5, 0xf5, 0x0a, 0x90, 0xe6, 0x73, 0x7b, 0x6a, 0x71, 0x16,
+	0x7e, 0x72, 0xc2, 0xd5, 0x08, 0xff, 0xca, 0x77, 0xac, 0xea, 0xc1, 0x46, 0x5a, 0xd0, 0x06, 0xb4,
+	0xd5, 0x11, 0x83, 0x8f, 0x3e, 0x6b, 0x47, 0x8c, 0x7f, 0x69, 0xaa, 0x7e, 0x72, 0x1b, 0x39, 0xd0,
+	0x36, 0x82, 0xdd, 0x0d, 0x43, 0x00, 0xfe, 0xbf, 0xa8, 0x05, 0xb7, 0x8e, 0x10, 0xd5, 0xc7, 0xbf,
+	0xc4, 0xb6, 0xdc, 0x65, 0xc3, 0xb4, 0x10, 0xdb, 0xe5, 0xf6, 0x59, 0x23, 0xb6, 0xcb, 0xc7, 0x86,
+	0x8e, 0x1f, 0x01, 0xad, 0x76, 0x93, 0xb8, 0xb6, 0x2a, 0xbb, 0xde, 0xd9, 0x56, 0x3f, 0xff, 0x28,
+	0x4f, 0xa0, 0x5c, 0x07, 0x58, 0xf6, 0x64, 0xf8, 0x41, 0x44, 0x64, 0xad, 0xa7, 0xac, 0x3e, 0xbc,
+	0x85, 0x1a, 0xa8, 0xea, 0xc3, 0xee, 0x86, 0x26, 0x2d, 0xe6, 0x8d, 0xdb, 0x9b, 0xb8, 0xea, 0xde,
+	0xa6, 0xe6, 0xe0, 0x45, 0xe2, 0xe4, 0xff, 0xff, 0xf0, 0xfc, 0xca, 0xe6, 0xe3, 0xf9, 0xc5, 0xb3,
+	0xa1, 0x3b, 0x7d, 0x3e, 0xb1, 0xaf, 0xc6, 0xdc, 0xb1, 0x9d, 0x2b, 0x87, 0xf1, 0xf7, 0xae, 0x77,
+	0xfd, 0x7c, 0xe2, 0x8c, 0x9e, 0xcb, 0x86, 0xf1, 0xf9, 0x42, 0xfc, 0x62, 0x5b, 0xfe, 0xa9, 0xe4,
+	0x37, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x78, 0xcd, 0x6f, 0x28, 0x5a, 0x19, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1711,6 +2273,10 @@ type RouterClient interface {
 	//keys. It retrieves the relevant channel policies from the graph in order to
 	//calculate the correct fees and time locks.
 	BuildRoute(ctx context.Context, in *BuildRouteRequest, opts ...grpc.CallOption) (*BuildRouteResponse, error)
+	//*
+	//SubscribeHtlcEvents creates a uni-directional stream from the server to
+	//the client which delivers a stream of htlc events.
+	SubscribeHtlcEvents(ctx context.Context, in *SubscribeHtlcEventsRequest, opts ...grpc.CallOption) (Router_SubscribeHtlcEventsClient, error)
 }
 
 type routerClient struct {
@@ -1839,6 +2405,38 @@ func (c *routerClient) BuildRoute(ctx context.Context, in *BuildRouteRequest, op
 	return out, nil
 }
 
+func (c *routerClient) SubscribeHtlcEvents(ctx context.Context, in *SubscribeHtlcEventsRequest, opts ...grpc.CallOption) (Router_SubscribeHtlcEventsClient, error) {
+	stream, err := c.cc.NewStream(ctx, &_Router_serviceDesc.Streams[2], "/routerrpc.Router/SubscribeHtlcEvents", opts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &routerSubscribeHtlcEventsClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type Router_SubscribeHtlcEventsClient interface {
+	Recv() (*HtlcEvent, error)
+	grpc.ClientStream
+}
+
+type routerSubscribeHtlcEventsClient struct {
+	grpc.ClientStream
+}
+
+func (x *routerSubscribeHtlcEventsClient) Recv() (*HtlcEvent, error) {
+	m := new(HtlcEvent)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // RouterServer is the server API for Router service.
 type RouterServer interface {
 	//*
@@ -1876,6 +2474,10 @@ type RouterServer interface {
 	//keys. It retrieves the relevant channel policies from the graph in order to
 	//calculate the correct fees and time locks.
 	BuildRoute(context.Context, *BuildRouteRequest) (*BuildRouteResponse, error)
+	//*
+	//SubscribeHtlcEvents creates a uni-directional stream from the server to
+	//the client which delivers a stream of htlc events.
+	SubscribeHtlcEvents(*SubscribeHtlcEventsRequest, Router_SubscribeHtlcEventsServer) error
 }
 
 func RegisterRouterServer(s *grpc.Server, srv RouterServer) {
@@ -2032,6 +2634,27 @@ func _Router_BuildRoute_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Router_SubscribeHtlcEvents_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(SubscribeHtlcEventsRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(RouterServer).SubscribeHtlcEvents(m, &routerSubscribeHtlcEventsServer{stream})
+}
+
+type Router_SubscribeHtlcEventsServer interface {
+	Send(*HtlcEvent) error
+	grpc.ServerStream
+}
+
+type routerSubscribeHtlcEventsServer struct {
+	grpc.ServerStream
+}
+
+func (x *routerSubscribeHtlcEventsServer) Send(m *HtlcEvent) error {
+	return x.ServerStream.SendMsg(m)
+}
+
 var _Router_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "routerrpc.Router",
 	HandlerType: (*RouterServer)(nil),
@@ -2072,6 +2695,11 @@ var _Router_serviceDesc = grpc.ServiceDesc{
 			Handler:       _Router_TrackPayment_Handler,
 			ServerStreams: true,
 		},
+		{
+			StreamName:    "SubscribeHtlcEvents",
+			Handler:       _Router_SubscribeHtlcEvents_Handler,
+			ServerStreams: true,
+		},
 	},
 	Metadata: "routerrpc/router.proto",
 }
diff --git a/lnrpc/routerrpc/router.proto b/lnrpc/routerrpc/router.proto
index bc5ad74d62c1..9139391c3b3b 100644
--- a/lnrpc/routerrpc/router.proto
+++ b/lnrpc/routerrpc/router.proto
@@ -490,6 +490,120 @@ message BuildRouteResponse {
     lnrpc.Route route = 1;
 }
 
+
+message SubscribeHtlcEventsRequest{}
+
+message HtlcEvent{
+    /**
+    IncomingChannel is the channel that the incoming htlc arrived at our node
+    on. This value is zero for sends.
+    */
+    uint64 incoming_channel = 1 [json_name="incoming_channel"];
+
+    /**
+    Outgoing channel is the channel that the outgoing htlc left our node on.
+    This value is zero for receives.
+    */
+    uint64 outgoing_channel = 2 [json_name="outgoing_channel"];
+
+    /**
+    Incoming id is the index of the incoming htlc in the incoming channel.
+    This value is zero for sends.
+    */
+    uint64 incoming_htlc_id = 3 [json_name="incoming_htlc_id"];
+
+    /**
+    Outgoing id is the index of the outgoing htlc in the outgoing channel.
+    This value is zero for receives.
+    */
+    uint64 outgoing_htlc_id = 4 [json_name="outgoing_htlc_id"];
+
+    // The timelock on the incoming htlc.
+    uint32 incoming_timelock = 5 [json_name="incoming_timelock"];
+
+    // The timelock on the outgoing htlc.
+    uint32 outgoing_timelock = 6 [json_name="outgoing_timelock"];
+
+    // The amount of the incoming htlc.
+    uint64 incoming_amt_msat = 7 [json_name="incoming_amt_msat"];
+
+    // The amount of the outgoing htlc.
+    uint64 outgoing_amt_msat = 8 [json_name ="outgoing_amt_msat"];
+
+    /**
+    Timestamp is the time (unix epoch offset in seconds) that the event
+    occurred.
+    */
+    uint64 timestamp = 9 [json_name="timestamp"];
+
+    enum EventType{
+        UNKNOWN = 0;
+        SEND = 1;
+        RECEIVE = 2;
+        FORWARD = 3;
+    }
+
+    /**
+    The event type indicates whether the htlc was part of a send, receive or
+    forward.
+    */
+    EventType event_type = 10 [json_name ="event_type"];
+
+    oneof event {
+        ForwardEvent forward_event = 11 [json_name = "forward_event"];
+        ForwardFailEvent forward_fail_event = 12 [json_name = "forward_fail_event"];
+        SettleEvent settle_event = 13 [json_name = "settle_event"];
+        LinkFailEvent link_fail_event = 14 [json_name= "link_fail_event"];
+    }
+}
+
+message ForwardEvent{}
+
+message ForwardFailEvent{}
+
+message SettleEvent{}
+
+message LinkFailEvent{
+    // FailureCode is the BOLT error code for the failure.
+    Failure.FailureCode wire_failure = 1 [json_name = "wire_failure"];
+
+    /**
+    FailureDetail provides additional information about the reason for the
+    failure. This detail enriches the information provided by the wire message
+    and may be 'no detail' if the wire message requires no additional metadata.
+    */
+    FailureDetail failure_detail = 2 [json_name = "failure_detail"];
+
+    // A string representation of the link failure.
+    string failure_string = 3 [json_name = "failure_string"];
+}
+
+enum FailureDetail {
+    UNKNOWN = 0;
+    NO_DETAIL = 1;
+    ONION_DECODE = 2;
+    LINK_NOT_ELIGIBLE = 3;
+    ON_CHAIN_TIMEOUT = 4;
+    HTLC_EXCEEDS_MAX = 5;
+    INSUFFICIENT_BALANCE =6;
+    INCOMPLETE_FORWARD = 7;
+    HTLC_ADD_FAILED = 8;
+    FORWARDS_DISABLED = 9;
+    INVOICE_CANCELED = 10;
+    INVOICE_UNDERPAID = 11;
+    INVOICE_EXPIRY_TOO_SOON = 12;
+    INVOICE_NOT_OPEN = 13;
+    MPP_INVOICE_TIMEOUT = 14;
+    ADDRESS_MISMATCH = 15;
+    SET_TOTAL_MISMATCH = 16;
+    SET_TOTAL_TOO_LOW = 17;
+    SET_OVERPAID = 18;
+    UNKNOWN_INVOICE = 19;
+    INVALID_KEYSEND = 20;
+    MPP_IN_PROGRESS = 21;
+    CIRCULAR_ROUTE = 22;
+}
+
 service Router {
     /**
     SendPayment attempts to route a payment described by the passed
@@ -542,4 +656,10 @@ service Router {
     calculate the correct fees and time locks.
     */
     rpc BuildRoute(BuildRouteRequest) returns (BuildRouteResponse);
+
+    /**
+    SubscribeHtlcEvents creates a uni-directional stream from the server to
+    the client which delivers a stream of htlc events.
+    */
+    rpc SubscribeHtlcEvents (SubscribeHtlcEventsRequest) returns (stream HtlcEvent);
 }
diff --git a/lnrpc/routerrpc/router_backend.go b/lnrpc/routerrpc/router_backend.go
index 4802902e36a1..e85aa2d324c7 100644
--- a/lnrpc/routerrpc/router_backend.go
+++ b/lnrpc/routerrpc/router_backend.go
@@ -19,6 +19,7 @@ import (
 	"github.com/lightningnetwork/lnd/record"
 	"github.com/lightningnetwork/lnd/routing"
 	"github.com/lightningnetwork/lnd/routing/route"
+	"github.com/lightningnetwork/lnd/subscribe"
 	"github.com/lightningnetwork/lnd/zpay32"
 )
 
@@ -67,6 +68,10 @@ type RouterBackend struct {
 	// DefaultFinalCltvDelta is the default value used as final cltv delta
 	// when an RPC caller doesn't specify a value.
 	DefaultFinalCltvDelta uint16
+
+	// SubscribeHtlcEvents returns a subscription client for the node's
+	// htlc events.
+	SubscribeHtlcEvents func() (*subscribe.Client, error)
 }
 
 // MissionControl defines the mission control dependencies of routerrpc.
diff --git a/lnrpc/routerrpc/router_server.go b/lnrpc/routerrpc/router_server.go
index a1b7948c100e..d8ef5f7752ed 100644
--- a/lnrpc/routerrpc/router_server.go
+++ b/lnrpc/routerrpc/router_server.go
@@ -80,6 +80,10 @@ var (
 			Entity: "offchain",
 			Action: "read",
 		}},
+		"/routerrpc.Router/SubscribeHtlcEvents": {{
+			Entity: "offchain",
+			Action: "read",
+		}},
 	}
 
 	// DefaultRouterMacFilename is the default name of the router macaroon
@@ -92,6 +96,8 @@ var (
 // allows clients to route arbitrary payment through the Lightning Network.
 type Server struct {
 	cfg *Config
+
+	quit chan struct{}
 }
 
 // A compile time check to ensure that Server fully implements the RouterServer
@@ -151,7 +157,8 @@ func New(cfg *Config) (*Server, lnrpc.MacaroonPerms, error) {
 	}
 
 	routerServer := &Server{
-		cfg: cfg,
+		cfg:  cfg,
+		quit: make(chan struct{}),
 	}
 
 	return routerServer, macPermissions, nil
@@ -168,6 +175,7 @@ func (s *Server) Start() error {
 //
 // NOTE: This is part of the lnrpc.SubServer interface.
 func (s *Server) Stop() error {
+	close(s.quit)
 	return nil
 }
 
@@ -743,3 +751,38 @@ func (s *Server) BuildRoute(ctx context.Context,
 
 	return routeResp, nil
 }
+
+// SubscribeHtlcEvents creates a uni-directional stream from the server to
+// the client which delivers a stream of htlc events.
+func (s *Server) SubscribeHtlcEvents(req *SubscribeHtlcEventsRequest,
+	stream Router_SubscribeHtlcEventsServer) error {
+
+	htlcClient, err := s.cfg.RouterBackend.SubscribeHtlcEvents()
+	if err != nil {
+		return err
+	}
+	defer htlcClient.Cancel()
+
+	for {
+		select {
+		case event := <-htlcClient.Updates():
+			htlcEvent, ok := event.(htlcswitch.HtlcEvent)
+			if !ok {
+				return fmt.Errorf("unexpected event type: %T",
+					event)
+			}
+
+			rpcEvent, err := rpcHtlcEvent(htlcEvent)
+			if err != nil {
+				return err
+			}
+
+			if err := stream.Send(rpcEvent); err != nil {
+				return err
+			}
+
+		case <-s.quit:
+			return errors.New("server shutting down")
+		}
+	}
+}
diff --git a/lnrpc/routerrpc/subscribe_events.go b/lnrpc/routerrpc/subscribe_events.go
new file mode 100644
index 000000000000..ca4ce4c13be2
--- /dev/null
+++ b/lnrpc/routerrpc/subscribe_events.go
@@ -0,0 +1,214 @@
+// +build routerrpc
+
+package routerrpc
+
+import (
+	"fmt"
+
+	"github.com/lightningnetwork/lnd/htlcswitch"
+	"github.com/lightningnetwork/lnd/invoices"
+)
+
+// rpcHtlcEvent returns a rpc htlc event from a htlcswitch event.
+func rpcHtlcEvent(htlcEvent htlcswitch.HtlcEvent) (*HtlcEvent, error) {
+	key := htlcEvent.Key()
+
+	rpcEvent := &HtlcEvent{
+		IncomingChannel: key.IncomingCircuit.ChanID.ToUint64(),
+		OutgoingChannel: key.OutgoingCircuit.ChanID.ToUint64(),
+		IncomingHtlcId:  key.IncomingCircuit.HtlcID,
+		OutgoingHtlcId:  key.OutgoingCircuit.HtlcID,
+		Timestamp:       uint64(htlcEvent.Timestamp().Unix()),
+	}
+
+	switch e := htlcEvent.(type) {
+	case *htlcswitch.ForwardingEvent:
+		rpcEvent.IncomingTimelock = e.HtlcInfo.IncomingTimeLock
+		rpcEvent.OutgoingTimelock = e.HtlcInfo.OutgoingTimeLock
+		rpcEvent.IncomingAmtMsat = uint64(e.HtlcInfo.IncomingAmt)
+		rpcEvent.OutgoingAmtMsat = uint64(e.HtlcInfo.OutgoingAmt)
+
+		rpcEvent.Event = &HtlcEvent_ForwardEvent{
+			ForwardEvent: &ForwardEvent{},
+		}
+
+	case *htlcswitch.ForwardingFailEvent:
+		rpcEvent.Event = &HtlcEvent_ForwardFailEvent{
+			ForwardFailEvent: &ForwardFailEvent{},
+		}
+
+	case *htlcswitch.LinkFailEvent:
+		rpcEvent.IncomingTimelock = e.HtlcInfo.IncomingTimeLock
+		rpcEvent.OutgoingTimelock = e.HtlcInfo.OutgoingTimeLock
+		rpcEvent.IncomingAmtMsat = uint64(e.HtlcInfo.IncomingAmt)
+		rpcEvent.OutgoingAmtMsat = uint64(e.HtlcInfo.OutgoingAmt)
+
+		failureCode, failReason, err := rpcFailReason(
+			e.LinkError,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		rpcEvent.Event = &HtlcEvent_LinkFailEvent{
+			LinkFailEvent: &LinkFailEvent{
+				WireFailure:   failureCode,
+				FailureDetail: failReason,
+				FailureString: e.LinkError.Error(),
+			},
+		}
+
+	case *htlcswitch.SettleEvent:
+		rpcEvent.Event = &HtlcEvent_SettleEvent{
+			SettleEvent: &SettleEvent{},
+		}
+
+	default:
+		return nil, fmt.Errorf("unknown event type: %T", e)
+	}
+
+	// Convert the htlc event type to a rpc event.
+	switch htlcEvent.EventType() {
+	case htlcswitch.HtlcEventTypeSend:
+		rpcEvent.EventType = HtlcEvent_SEND
+
+	case htlcswitch.HtlcEventTypeReceive:
+		rpcEvent.EventType = HtlcEvent_RECEIVE
+
+	case htlcswitch.HtlcEventTypeForward:
+		rpcEvent.EventType = HtlcEvent_FORWARD
+
+	default:
+		return nil, fmt.Errorf("unknown event type: %v",
+			htlcEvent.EventType())
+	}
+
+	return rpcEvent, nil
+}
+
+// rpcFailReason maps a lnwire failure message and failure detail to a rpc
+// failure code and detail.
+func rpcFailReason(linkErr *htlcswitch.LinkError) (Failure_FailureCode,
+	FailureDetail, error) {
+
+	wireErr, err := marshallError(linkErr)
+	if err != nil {
+		return 0, 0, err
+	}
+
+	switch failureDetail := linkErr.FailureDetail.(type) {
+	case invoices.FailResolutionResult:
+		fd, err := rpcFailureResolution(failureDetail)
+		return wireErr.GetCode(), fd, err
+
+	case htlcswitch.OutgoingFailure:
+		fd, err := rpcOutgoingFailure(failureDetail)
+		return wireErr.GetCode(), fd, err
+
+	default:
+		return 0, 0, fmt.Errorf("unknown failure "+
+			"detail type: %T", linkErr.FailureDetail)
+
+	}
+
+}
+
+// rpcFailureResolution maps an invoice failure resolution to a rpc failure
+// detail. Invoice failures have no zero resolution results (every failure
+// is accompanied with a result), so we error if we fail to match the result
+// type.
+func rpcFailureResolution(invoiceFailure invoices.FailResolutionResult) (
+	FailureDetail, error) {
+
+	switch invoiceFailure {
+	case invoices.ResultReplayToCanceled:
+		return FailureDetail_INVOICE_CANCELED, nil
+
+	case invoices.ResultInvoiceAlreadyCanceled:
+		return FailureDetail_INVOICE_CANCELED, nil
+
+	case invoices.ResultAmountTooLow:
+		return FailureDetail_INVOICE_UNDERPAID, nil
+
+	case invoices.ResultExpiryTooSoon:
+		return FailureDetail_INVOICE_EXPIRY_TOO_SOON, nil
+
+	case invoices.ResultCanceled:
+		return FailureDetail_INVOICE_CANCELED, nil
+
+	case invoices.ResultInvoiceNotOpen:
+		return FailureDetail_INVOICE_NOT_OPEN, nil
+
+	case invoices.ResultMppTimeout:
+		return FailureDetail_MPP_INVOICE_TIMEOUT, nil
+
+	case invoices.ResultAddressMismatch:
+		return FailureDetail_ADDRESS_MISMATCH, nil
+
+	case invoices.ResultHtlcSetTotalMismatch:
+		return FailureDetail_SET_TOTAL_MISMATCH, nil
+
+	case invoices.ResultHtlcSetTotalTooLow:
+		return FailureDetail_SET_TOTAL_TOO_LOW, nil
+
+	case invoices.ResultHtlcSetOverpayment:
+		return FailureDetail_SET_OVERPAID, nil
+
+	case invoices.ResultInvoiceNotFound:
+		return FailureDetail_UNKNOWN_INVOICE, nil
+
+	case invoices.ResultKeySendError:
+		return FailureDetail_INVALID_KEYSEND, nil
+
+	case invoices.ResultMppInProgress:
+		return FailureDetail_MPP_IN_PROGRESS, nil
+
+	default:
+		return 0, fmt.Errorf("unknown fail resolution: %v",
+			invoiceFailure.FailureString())
+	}
+}
+
+// rpcOutgoingFailure maps an outgoing failure to a rpc FailureDetail. If the
+// failure detail is FailureDetailNone, which indicates that the failure was
+// a wire message which required no further failure detail, we return a no
+// detail failure detail to indicate that there was no additional information.
+func rpcOutgoingFailure(failureDetail htlcswitch.OutgoingFailure) (
+	FailureDetail, error) {
+
+	switch failureDetail {
+	case htlcswitch.OutgoingFailureNone:
+		return FailureDetail_NO_DETAIL, nil
+
+	case htlcswitch.OutgoingFailureDecodeError:
+		return FailureDetail_ONION_DECODE, nil
+
+	case htlcswitch.OutgoingFailureLinkNotEligible:
+		return FailureDetail_LINK_NOT_ELIGIBLE, nil
+
+	case htlcswitch.OutgoingFailureOnChainTimeout:
+		return FailureDetail_ON_CHAIN_TIMEOUT, nil
+
+	case htlcswitch.OutgoingFailureHTLCExceedsMax:
+		return FailureDetail_HTLC_EXCEEDS_MAX, nil
+
+	case htlcswitch.OutgoingFailureInsufficientBalance:
+		return FailureDetail_INSUFFICIENT_BALANCE, nil
+
+	case htlcswitch.OutgoingFailureCircularRoute:
+		return FailureDetail_CIRCULAR_ROUTE, nil
+
+	case htlcswitch.OutgoingFailureIncompleteForward:
+		return FailureDetail_INCOMPLETE_FORWARD, nil
+
+	case htlcswitch.OutgoingFailureDownstreamHtlcAdd:
+		return FailureDetail_HTLC_ADD_FAILED, nil
+
+	case htlcswitch.OutgoingFailureForwardsDisabled:
+		return FailureDetail_FORWARDS_DISABLED, nil
+
+	default:
+		return 0, fmt.Errorf("unknown outgoing failure "+
+			"detail: %v", failureDetail.FailureString())
+	}
+}
diff --git a/rpcserver.go b/rpcserver.go
index a653741ef7b3..c71519b12e13 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -567,6 +567,7 @@ func newRPCServer(s *server, macService *macaroons.Service,
 		Tower:                 s.controlTower,
 		MaxTotalTimelock:      cfg.MaxOutgoingCltvExpiry,
 		DefaultFinalCltvDelta: uint16(cfg.Bitcoin.TimeLockDelta),
+		SubscribeHtlcEvents:   s.htlcNotifier.SubscribeHtlcEvents,
 	}
 
 	genInvoiceFeatures := func() *lnwire.FeatureVector {