diff --git a/lnrpc/rpc.pb.go b/lnrpc/rpc.pb.go
index e1a9abca..e38eade7 100644
--- a/lnrpc/rpc.pb.go
+++ b/lnrpc/rpc.pb.go
@@ -176,13 +176,15 @@ func (*HTLC) ProtoMessage()               {}
 func (*HTLC) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
 
 type ActiveChannel struct {
-	FundingTxid      []byte  `protobuf:"bytes,1,opt,name=funding_txid,proto3" json:"funding_txid,omitempty"`
-	Capacity         int64   `protobuf:"varint,2,opt,name=capacity" json:"capacity,omitempty"`
-	LocalBalance     int64   `protobuf:"varint,3,opt,name=local_balance" json:"local_balance,omitempty"`
-	RemoteBalance    int64   `protobuf:"varint,4,opt,name=remote_balance" json:"remote_balance,omitempty"`
-	UnsettledBelance int64   `protobuf:"varint,5,opt,name=unsettled_belance" json:"unsettled_belance,omitempty"`
-	PendingHtlcs     []*HTLC `protobuf:"bytes,6,rep,name=pending_htlcs" json:"pending_htlcs,omitempty"`
-	NumUpdates       int64   `protobuf:"varint,7,opt,name=num_updates" json:"num_updates,omitempty"`
+	// TODO(roasbeef): make channel points a string everywhere in rpc?
+	RemoteId         string  `protobuf:"bytes,1,opt,name=remote_id" json:"remote_id,omitempty"`
+	ChannelPoint     string  `protobuf:"bytes,2,opt,name=channel_point" json:"channel_point,omitempty"`
+	Capacity         int64   `protobuf:"varint,3,opt,name=capacity" json:"capacity,omitempty"`
+	LocalBalance     int64   `protobuf:"varint,4,opt,name=local_balance" json:"local_balance,omitempty"`
+	RemoteBalance    int64   `protobuf:"varint,5,opt,name=remote_balance" json:"remote_balance,omitempty"`
+	UnsettledBelance int64   `protobuf:"varint,6,opt,name=unsettled_belance" json:"unsettled_belance,omitempty"`
+	PendingHtlcs     []*HTLC `protobuf:"bytes,7,rep,name=pending_htlcs" json:"pending_htlcs,omitempty"`
+	NumUpdates       uint64  `protobuf:"varint,8,opt,name=num_updates" json:"num_updates,omitempty"`
 }
 
 func (m *ActiveChannel) Reset()                    { *m = ActiveChannel{} }
@@ -621,65 +623,66 @@ var _Lightning_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 950 bytes of a gzipped FileDescriptorProto
+	// 961 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x94, 0x56, 0xdd, 0x6e, 0xdb, 0x36,
-	0x14, 0x9e, 0x62, 0x3b, 0xb5, 0x8f, 0xec, 0x24, 0xa6, 0x9d, 0x46, 0xd5, 0x3a, 0xa0, 0x20, 0xd6,
+	0x14, 0x9e, 0x63, 0x3b, 0xb1, 0x8f, 0xec, 0x24, 0xa6, 0x9d, 0x46, 0xd5, 0x3a, 0xa0, 0x20, 0xd6,
 	0x2e, 0x18, 0x0a, 0x0f, 0x70, 0x77, 0x31, 0xb4, 0x40, 0x01, 0x37, 0x09, 0x96, 0xad, 0x5d, 0x1b,
-	0x2c, 0x1e, 0x8a, 0x5d, 0x11, 0xb2, 0xc4, 0xc4, 0x42, 0x65, 0x52, 0x13, 0xa9, 0x24, 0xde, 0x03,
-	0xec, 0x19, 0xf6, 0x2c, 0xbb, 0xdd, 0xeb, 0xec, 0x21, 0x46, 0x52, 0x94, 0x2d, 0xff, 0xe4, 0xa2,
-	0x97, 0x3a, 0xfc, 0x78, 0xf8, 0x9d, 0xef, 0x7c, 0xe7, 0xd8, 0xd0, 0xca, 0xd2, 0x70, 0x90, 0x66,
-	0x5c, 0x72, 0xd4, 0x48, 0x98, 0xfa, 0xc0, 0x2f, 0xa1, 0x7d, 0x32, 0x0d, 0x18, 0xa3, 0xc9, 0x05,
-	0x8f, 0x99, 0x44, 0x7d, 0x68, 0x5f, 0xe5, 0x2c, 0x8a, 0xd9, 0x35, 0x91, 0x77, 0x71, 0xe4, 0x39,
-	0x4f, 0x9c, 0xe3, 0xb6, 0x8e, 0xf2, 0x5c, 0xa6, 0xb9, 0x24, 0x31, 0x8b, 0xe8, 0x9d, 0xb7, 0xa3,
-	0xa2, 0x1d, 0xfc, 0x3d, 0x1c, 0xbc, 0x8b, 0xaf, 0xa7, 0x92, 0x29, 0xf4, 0x28, 0x8a, 0x32, 0x2a,
-	0x04, 0x42, 0x00, 0x69, 0x3e, 0x79, 0x4b, 0xe7, 0xe7, 0x81, 0x98, 0x9a, 0xdb, 0x2d, 0xd4, 0x86,
-	0xfa, 0x94, 0x0b, 0x69, 0x6e, 0xb5, 0xf0, 0x5f, 0x0e, 0xec, 0x5f, 0x52, 0x16, 0xfd, 0x12, 0xb0,
-	0xf9, 0xaf, 0xf4, 0x8f, 0x9c, 0x0a, 0x89, 0x5e, 0x43, 0x5b, 0x27, 0x18, 0xf3, 0xd1, 0x8c, 0xe7,
-	0x4c, 0xaa, 0x7b, 0xb5, 0x63, 0x77, 0x78, 0x3c, 0x30, 0x1c, 0x07, 0x6b, 0xe8, 0x41, 0x15, 0x7a,
-	0xc6, 0x64, 0x36, 0xf7, 0x5f, 0x40, 0x77, 0x23, 0x88, 0x5c, 0xa8, 0x7d, 0xa2, 0x73, 0xcb, 0xa1,
-	0x03, 0x8d, 0x9b, 0x20, 0xc9, 0xa9, 0x21, 0x51, 0x7b, 0xb9, 0xf3, 0x83, 0x83, 0x9f, 0xc0, 0xc1,
-	0x32, 0xb3, 0x48, 0x39, 0x13, 0x54, 0x53, 0x5d, 0x94, 0xdd, 0xc2, 0x7f, 0x3b, 0xd0, 0x7d, 0x4f,
-	0x6f, 0x6d, 0x6d, 0x25, 0xd9, 0xa1, 0xc2, 0xcc, 0x53, 0x6a, 0x30, 0x7b, 0xc3, 0xaf, 0x2d, 0xc9,
-	0x0d, 0xdc, 0xc0, 0x7e, 0x8e, 0x15, 0x16, 0x7f, 0x00, 0xb7, 0xf2, 0x89, 0x8e, 0xa0, 0xf7, 0xf1,
-	0xa7, 0xf1, 0xfb, 0xb3, 0xcb, 0x4b, 0x72, 0xf1, 0xdb, 0x9b, 0xb7, 0x67, 0xbf, 0x93, 0xf3, 0xd1,
-	0xe5, 0xf9, 0xc1, 0x17, 0xe8, 0x21, 0x20, 0x15, 0x1d, 0x9f, 0x9d, 0xae, 0xc4, 0x1d, 0xb4, 0x0f,
-	0x6e, 0x35, 0xb0, 0x83, 0x9f, 0x2a, 0x60, 0xe5, 0x45, 0x4b, 0x7f, 0x1f, 0x1e, 0x04, 0x45, 0xc8,
-	0x56, 0xf0, 0x0a, 0xd0, 0x09, 0x57, 0xdd, 0x0d, 0xe5, 0x05, 0xa5, 0x59, 0x59, 0xc1, 0x53, 0xa8,
-	0x6b, 0x98, 0xc1, 0xb8, 0xc3, 0x23, 0x5b, 0xc1, 0x7a, 0x2f, 0xf1, 0x33, 0xe8, 0xad, 0x5c, 0x5e,
-	0x3e, 0x92, 0xaa, 0x6f, 0x62, 0x65, 0x6a, 0xe0, 0x53, 0xa8, 0x9f, 0x8f, 0xdf, 0x9d, 0xa8, 0xd6,
-	0xef, 0xd8, 0x58, 0x0d, 0xed, 0xc1, 0x6e, 0x50, 0xf4, 0xd2, 0x08, 0x8e, 0xba, 0xd0, 0x9a, 0x2a,
-	0x47, 0x90, 0x84, 0x87, 0x9f, 0xbc, 0x9a, 0x31, 0x95, 0x6a, 0x89, 0xe4, 0x24, 0x17, 0x5e, 0x5d,
-	0x7d, 0x36, 0xf1, 0x3f, 0x0e, 0x74, 0x46, 0xa1, 0x8c, 0x6f, 0xa8, 0x35, 0xe4, 0x3d, 0x5e, 0x3c,
-	0x80, 0x66, 0x18, 0xa4, 0x41, 0x18, 0xcb, 0xb9, 0xcd, 0x7d, 0x08, 0x1d, 0x95, 0x36, 0x48, 0xc8,
-	0x24, 0x48, 0x02, 0x16, 0x52, 0x93, 0xbf, 0xa6, 0xb4, 0xdc, 0xcb, 0xe8, 0x8c, 0x4b, 0xba, 0x88,
-	0xd7, 0x4d, 0xfc, 0x11, 0x74, 0x73, 0x55, 0x87, 0x94, 0x09, 0x8d, 0xc8, 0x84, 0x16, 0x47, 0x0d,
-	0x73, 0x84, 0xa1, 0x93, 0xd2, 0xe2, 0xc5, 0xa9, 0x4c, 0x42, 0xe1, 0xed, 0x1a, 0x23, 0xba, 0x56,
-	0x21, 0x53, 0x65, 0x0f, 0x5c, 0x96, 0xcf, 0x48, 0x9e, 0x46, 0x81, 0xa4, 0xc2, 0x7b, 0xa0, 0x2f,
-	0xe2, 0x7f, 0x1d, 0xa8, 0x6b, 0x91, 0x34, 0xe7, 0xa4, 0xd4, 0xb1, 0x54, 0xa8, 0x55, 0x95, 0x4c,
-	0x53, 0x6e, 0x54, 0x1b, 0x55, 0x33, 0x08, 0x25, 0xde, 0x64, 0xae, 0xf2, 0x11, 0x41, 0x95, 0x66,
-	0x9a, 0x68, 0x7d, 0x19, 0xcb, 0x68, 0x78, 0x63, 0x18, 0xd6, 0x75, 0xf5, 0x22, 0x90, 0x05, 0x6a,
-	0xd7, 0x70, 0xb6, 0x11, 0x83, 0x31, 0x64, 0x74, 0xf2, 0x98, 0x4d, 0x94, 0xf8, 0x91, 0xd7, 0xd4,
-	0xd2, 0xa2, 0x67, 0x4a, 0xb2, 0x42, 0x53, 0xe1, 0xb5, 0x4c, 0x45, 0x7d, 0x5b, 0xd1, 0x8a, 0xe0,
-	0x18, 0xe9, 0x81, 0x16, 0xa6, 0xdb, 0xa5, 0x8b, 0xf1, 0x77, 0xd0, 0xad, 0xc4, 0xac, 0x05, 0x7c,
-	0x68, 0xe8, 0x7a, 0x84, 0x1d, 0xd4, 0x52, 0x1f, 0x0d, 0xd2, 0x52, 0xa0, 0x0f, 0x4a, 0x45, 0x9b,
-	0xb4, 0xf4, 0x9c, 0xea, 0x86, 0x0c, 0xb2, 0x6b, 0x2a, 0xc9, 0x8a, 0x79, 0xd0, 0x73, 0x70, 0x6d,
-	0x9c, 0xf1, 0xa8, 0x18, 0xcf, 0xfb, 0x2d, 0x89, 0x1e, 0x43, 0xbf, 0x68, 0x75, 0x69, 0x0c, 0x6b,
-	0xb2, 0xa2, 0xe3, 0x5f, 0xc1, 0xa1, 0xed, 0xf8, 0xda, 0x71, 0xd1, 0xf8, 0x23, 0xd8, 0x0f, 0xf9,
-	0x6c, 0x16, 0x0b, 0x11, 0x73, 0x46, 0x44, 0xfc, 0x67, 0xd9, 0x76, 0x65, 0x4e, 0xdd, 0xd2, 0x90,
-	0xb3, 0x2b, 0x61, 0x54, 0xed, 0xe0, 0x11, 0xf4, 0x56, 0x8a, 0xb0, 0x85, 0x7f, 0x0b, 0x1d, 0xab,
-	0x24, 0x49, 0xf5, 0xbe, 0xb4, 0x23, 0xd4, 0xb3, 0x7c, 0xab, 0xab, 0x14, 0xa7, 0x6a, 0x7c, 0x12,
-	0x2e, 0xe8, 0x9a, 0x10, 0x9f, 0x91, 0x42, 0x3b, 0x40, 0xc6, 0x33, 0x4a, 0x92, 0x78, 0x16, 0x97,
-	0x93, 0xa4, 0xec, 0x1b, 0x24, 0x09, 0xbf, 0x25, 0x57, 0x3c, 0x0b, 0x29, 0x09, 0xf5, 0x13, 0xa6,
-	0xfe, 0x26, 0xfe, 0x06, 0xfa, 0xab, 0x2f, 0x2e, 0x27, 0x56, 0xe4, 0x61, 0x58, 0xae, 0x85, 0x26,
-	0x7e, 0x0e, 0xfd, 0x8f, 0x2a, 0x09, 0x95, 0x6f, 0x8a, 0xc9, 0x28, 0xb9, 0x29, 0xf7, 0xde, 0xc6,
-	0x92, 0x29, 0x20, 0xe1, 0x2c, 0x99, 0x5b, 0xf4, 0x31, 0x1c, 0xae, 0xa1, 0x97, 0x79, 0xcb, 0xd1,
-	0xd2, 0x48, 0x67, 0xf8, 0x5f, 0x0d, 0x5a, 0x8b, 0x9e, 0xa1, 0x57, 0xd0, 0x2c, 0x17, 0x2c, 0x7a,
-	0xb8, 0x7d, 0x97, 0xfb, 0x47, 0x1b, 0x71, 0x9b, 0x7b, 0x04, 0xb0, 0x5c, 0x70, 0xc8, 0xbb, 0x6f,
-	0xcb, 0xfa, 0x8f, 0xb6, 0x9c, 0xd8, 0x14, 0xa7, 0xe0, 0x56, 0xf6, 0x17, 0x2a, 0x91, 0x9b, 0x0b,
-	0xd1, 0xf7, 0xb7, 0x1d, 0xd9, 0x2c, 0xaf, 0x75, 0x49, 0x76, 0x00, 0xd0, 0xd2, 0x98, 0xab, 0x63,
-	0xe2, 0x7b, 0x9b, 0x07, 0x4b, 0x16, 0x15, 0x27, 0x2d, 0x58, 0x6c, 0x8e, 0xc8, 0x82, 0xc5, 0x36,
-	0xe3, 0xfd, 0xa8, 0x7e, 0xa7, 0x2b, 0xad, 0x45, 0x0b, 0xc6, 0x9b, 0x0e, 0xf3, 0xbf, 0xdc, 0x7a,
-	0x66, 0x13, 0xfd, 0x0c, 0x9d, 0x95, 0x66, 0xa2, 0x12, 0xbd, 0xcd, 0x10, 0xfe, 0xe3, 0xed, 0x87,
-	0x45, 0xae, 0xc9, 0xae, 0xf9, 0x2b, 0xf1, 0xe2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0x04,
-	0x0c, 0x82, 0x57, 0x08, 0x00, 0x00,
+	0x2c, 0x1e, 0x8a, 0x5d, 0x11, 0xb2, 0xc4, 0xc4, 0x42, 0x65, 0x52, 0x13, 0xa9, 0xa4, 0xde, 0x03,
+	0xec, 0x19, 0xf6, 0x3e, 0xbb, 0xdf, 0x93, 0xec, 0x21, 0x46, 0x52, 0x94, 0x25, 0xff, 0xe4, 0xa2,
+	0x97, 0x3a, 0xfc, 0x78, 0xf8, 0x7d, 0xe7, 0x7c, 0xe7, 0xd8, 0xd0, 0x4e, 0x93, 0x60, 0x98, 0xa4,
+	0x5c, 0x72, 0xd4, 0x8c, 0x99, 0xfa, 0xc0, 0x2f, 0xa0, 0x73, 0x3a, 0xf3, 0x19, 0xa3, 0xf1, 0x25,
+	0x8f, 0x98, 0x44, 0x03, 0xe8, 0x5c, 0x67, 0x2c, 0x8c, 0xd8, 0x0d, 0x91, 0x9f, 0xa2, 0xd0, 0xad,
+	0x3d, 0xae, 0x9d, 0x74, 0x74, 0x94, 0x67, 0x32, 0xc9, 0x24, 0x89, 0x58, 0x48, 0x3f, 0xb9, 0x3b,
+	0x2a, 0xda, 0xc5, 0xdf, 0xc3, 0xe1, 0xdb, 0xe8, 0x66, 0x26, 0x99, 0x42, 0x8f, 0xc3, 0x30, 0xa5,
+	0x42, 0x20, 0x04, 0x90, 0x64, 0xd3, 0x37, 0x74, 0x71, 0xe1, 0x8b, 0x99, 0xb9, 0xdd, 0x46, 0x1d,
+	0x68, 0xcc, 0xb8, 0x90, 0xe6, 0x56, 0x1b, 0xff, 0x55, 0x83, 0x83, 0x2b, 0xca, 0xc2, 0x5f, 0x7c,
+	0xb6, 0xf8, 0x95, 0xfe, 0x91, 0x51, 0x21, 0xd1, 0x2b, 0xe8, 0xe8, 0x04, 0x13, 0x3e, 0x9e, 0xf3,
+	0x8c, 0x49, 0x75, 0xaf, 0x7e, 0xe2, 0x8c, 0x4e, 0x86, 0x86, 0xe3, 0x70, 0x0d, 0x3d, 0xac, 0x42,
+	0xcf, 0x99, 0x4c, 0x17, 0xde, 0x73, 0xe8, 0x6d, 0x04, 0x91, 0x03, 0xf5, 0x8f, 0x74, 0x61, 0x39,
+	0x74, 0xa1, 0x79, 0xeb, 0xc7, 0x19, 0x35, 0x24, 0xea, 0x2f, 0x76, 0x7e, 0xa8, 0xe1, 0xc7, 0x70,
+	0x58, 0x66, 0x16, 0x09, 0x67, 0x82, 0x6a, 0xaa, 0x4b, 0xd9, 0x6d, 0xfc, 0x77, 0x0d, 0x7a, 0xef,
+	0xe8, 0x9d, 0xd5, 0x56, 0x90, 0x1d, 0x29, 0xcc, 0x22, 0xa1, 0x06, 0xb3, 0x3f, 0xfa, 0xda, 0x92,
+	0xdc, 0xc0, 0x0d, 0xed, 0xe7, 0x44, 0x61, 0xf1, 0x7b, 0x70, 0x2a, 0x9f, 0xe8, 0x18, 0xfa, 0x1f,
+	0x7e, 0x9a, 0xbc, 0x3b, 0xbf, 0xba, 0x22, 0x97, 0xbf, 0xbd, 0x7e, 0x73, 0xfe, 0x3b, 0xb9, 0x18,
+	0x5f, 0x5d, 0x1c, 0x7e, 0x81, 0x1e, 0x00, 0x52, 0xd1, 0xc9, 0xf9, 0xd9, 0x4a, 0xbc, 0x86, 0x0e,
+	0xc0, 0xa9, 0x06, 0x76, 0xf0, 0x13, 0x05, 0xac, 0xbc, 0x68, 0xe9, 0x1f, 0xc0, 0x9e, 0x9f, 0x87,
+	0xac, 0x82, 0x97, 0x80, 0x4e, 0xb9, 0xea, 0x6e, 0x20, 0x2f, 0x29, 0x4d, 0x0b, 0x05, 0x4f, 0xa0,
+	0xa1, 0x61, 0x06, 0xe3, 0x8c, 0x8e, 0xad, 0x82, 0xf5, 0x5e, 0xe2, 0xa7, 0xd0, 0x5f, 0xb9, 0x5c,
+	0x3e, 0x92, 0xa8, 0x6f, 0x62, 0xcb, 0xd4, 0xc4, 0x67, 0xd0, 0xb8, 0x98, 0xbc, 0x3d, 0x55, 0xad,
+	0xdf, 0xb1, 0xb1, 0x3a, 0xda, 0x87, 0x5d, 0x3f, 0xef, 0xa5, 0x29, 0x38, 0xea, 0x41, 0x7b, 0xa6,
+	0x1c, 0x41, 0x62, 0x1e, 0x7c, 0x74, 0xeb, 0xc6, 0x54, 0xaa, 0x25, 0x92, 0x93, 0x4c, 0xb8, 0x0d,
+	0xf5, 0xd9, 0xc2, 0xff, 0xd6, 0xa0, 0x3b, 0x0e, 0x64, 0x74, 0x4b, 0xad, 0x21, 0xf5, 0x9d, 0x94,
+	0xce, 0xb9, 0xa4, 0xc5, 0x53, 0x6d, 0x74, 0x04, 0xdd, 0x20, 0x3f, 0x25, 0x89, 0xf6, 0x6b, 0xee,
+	0x29, 0x74, 0x08, 0xad, 0xc0, 0x4f, 0xfc, 0x20, 0x92, 0x0b, 0x93, 0xbc, 0xae, 0x81, 0xea, 0x29,
+	0x3f, 0x26, 0x53, 0x3f, 0xf6, 0x59, 0x40, 0xcd, 0x23, 0x75, 0x55, 0xdf, 0x7d, 0x9b, 0xb2, 0x88,
+	0x37, 0x4d, 0xfc, 0x21, 0xf4, 0x32, 0xa5, 0x4d, 0xca, 0x98, 0x86, 0x64, 0x4a, 0xf3, 0xa3, 0x5d,
+	0x73, 0x84, 0xa1, 0x9b, 0xd0, 0x7c, 0x22, 0x66, 0x32, 0x0e, 0x84, 0xbb, 0x67, 0xcc, 0xe9, 0xd8,
+	0xaa, 0x19, 0xe5, 0x7d, 0x70, 0x58, 0x36, 0x27, 0x59, 0x12, 0xfa, 0x92, 0x0a, 0xb7, 0xa5, 0x2e,
+	0x36, 0xf0, 0x3f, 0x35, 0x68, 0xe8, 0xc2, 0xe9, 0xe9, 0x89, 0x8b, 0xda, 0x96, 0x52, 0x2a, 0x65,
+	0xd4, 0x22, 0x9a, 0xd5, 0xe6, 0xd5, 0x0d, 0x42, 0x15, 0x74, 0xba, 0x50, 0xf9, 0x88, 0xa0, 0x4a,
+	0xa9, 0x16, 0xd0, 0x28, 0x63, 0x29, 0x0d, 0x6e, 0x0d, 0xf9, 0x86, 0x56, 0x2f, 0x7c, 0x99, 0xa3,
+	0x72, 0xce, 0x36, 0x62, 0x30, 0x7b, 0x26, 0xa2, 0x92, 0x47, 0x6c, 0xaa, 0x1a, 0x12, 0x1a, 0x76,
+	0x2d, 0xf4, 0x54, 0x95, 0x2c, 0xaf, 0xa4, 0x70, 0xdb, 0x46, 0xd1, 0xc0, 0x2a, 0x5a, 0x69, 0x02,
+	0x46, 0x7a, 0xc8, 0x85, 0x71, 0x40, 0xe1, 0x6c, 0xfc, 0x1d, 0xf4, 0x2a, 0x31, 0x6b, 0x0b, 0x0f,
+	0x9a, 0x5a, 0x8f, 0xb0, 0xc3, 0x5b, 0xd4, 0x47, 0x83, 0x74, 0x29, 0xd0, 0x7b, 0x55, 0x45, 0x9b,
+	0xb4, 0xf0, 0xa1, 0xea, 0x86, 0xf4, 0xd3, 0x1b, 0x2a, 0xc9, 0x8a, 0xa1, 0xd0, 0x33, 0x70, 0x6c,
+	0x9c, 0xf1, 0x30, 0x1f, 0xd9, 0xfb, 0x6d, 0x8a, 0x1e, 0xc1, 0x20, 0x6f, 0x75, 0xb1, 0xb8, 0xac,
+	0xf1, 0x72, 0x23, 0x7c, 0x05, 0x47, 0xb6, 0xe3, 0x6b, 0xc7, 0xb9, 0x21, 0x8e, 0xe1, 0x20, 0xe0,
+	0xf3, 0x79, 0x24, 0x44, 0xc4, 0x19, 0x11, 0xd1, 0x9f, 0x85, 0x23, 0x94, 0xf9, 0x74, 0x4b, 0x03,
+	0xce, 0xae, 0x85, 0xa9, 0x6a, 0x17, 0x8f, 0xa1, 0xbf, 0x22, 0xc2, 0x0a, 0xff, 0x76, 0xdd, 0x93,
+	0xf9, 0x58, 0xf5, 0x2d, 0xdf, 0xea, 0x7a, 0xc5, 0x89, 0x1a, 0xa9, 0x98, 0x0b, 0xba, 0x56, 0x88,
+	0xcf, 0x48, 0xa1, 0x1d, 0x20, 0xa3, 0x39, 0x25, 0x71, 0x34, 0x8f, 0x8a, 0xe9, 0x52, 0xf6, 0xf5,
+	0xe3, 0x98, 0xdf, 0x91, 0x6b, 0x9e, 0x06, 0x94, 0x04, 0xfa, 0x09, 0xa3, 0xbf, 0x85, 0xbf, 0x81,
+	0xc1, 0xea, 0x8b, 0xe5, 0x14, 0x8b, 0x2c, 0x08, 0x8a, 0x55, 0xd1, 0xc2, 0xcf, 0x60, 0xf0, 0x41,
+	0x25, 0xa1, 0xf2, 0x75, 0x3e, 0x19, 0x05, 0x37, 0xe5, 0xde, 0xbb, 0x48, 0x32, 0x05, 0x24, 0x9c,
+	0xc5, 0x0b, 0x8b, 0x3e, 0x81, 0xa3, 0x35, 0x74, 0x99, 0xb7, 0x18, 0x2d, 0x8d, 0xac, 0x8d, 0xfe,
+	0xab, 0x43, 0x7b, 0xd9, 0x33, 0xf4, 0x12, 0x5a, 0xc5, 0xd2, 0x45, 0x0f, 0xb6, 0xef, 0x77, 0xef,
+	0x78, 0x23, 0x6e, 0x73, 0x8f, 0x01, 0xca, 0xa5, 0x87, 0xdc, 0xfb, 0x36, 0xaf, 0xf7, 0x70, 0xcb,
+	0x89, 0x4d, 0x71, 0x06, 0x4e, 0x65, 0xa7, 0xa1, 0x02, 0xb9, 0xb9, 0x24, 0x3d, 0x6f, 0xdb, 0x91,
+	0xcd, 0xf2, 0x4a, 0x4b, 0xb2, 0x03, 0x80, 0x4a, 0x63, 0xae, 0x8e, 0x89, 0xe7, 0x6e, 0x1e, 0x94,
+	0x2c, 0x2a, 0x4e, 0x5a, 0xb2, 0xd8, 0x1c, 0x91, 0x25, 0x8b, 0x6d, 0xc6, 0xfb, 0x51, 0xfd, 0x76,
+	0x57, 0x5a, 0x8b, 0x96, 0x8c, 0x37, 0x1d, 0xe6, 0x7d, 0xb9, 0xf5, 0xcc, 0x26, 0xfa, 0x19, 0xba,
+	0x2b, 0xcd, 0x44, 0x05, 0x7a, 0x9b, 0x21, 0xbc, 0x47, 0xdb, 0x0f, 0xf3, 0x5c, 0xd3, 0x5d, 0xf3,
+	0xf7, 0xe2, 0xf9, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x90, 0xc6, 0xa9, 0x9d, 0x6b, 0x08, 0x00,
+	0x00,
 }
diff --git a/lnrpc/rpc.proto b/lnrpc/rpc.proto
index e8249401..921e3df6 100644
--- a/lnrpc/rpc.proto
+++ b/lnrpc/rpc.proto
@@ -64,16 +64,18 @@ message HTLC {
 }
 
 message ActiveChannel {
-    bytes funding_txid = 1;
+    // TODO(roasbeef): make channel points a string everywhere in rpc?
+    string remote_id = 1;
+    string channel_point = 2;
 
-    int64 capacity = 2;
-    int64 local_balance = 3; 
-    int64 remote_balance = 4;
+    int64 capacity = 3;
+    int64 local_balance = 4;
+    int64 remote_balance = 5;
 
-    int64 unsettled_belance = 5;
-    repeated HTLC pending_htlcs = 6;
+    int64 unsettled_belance = 6;
+    repeated HTLC pending_htlcs = 7;
 
-    int64 num_updates = 7;
+    uint64 num_updates = 8;
     // TODO(roasbeef): other stuffs
 }