diff --git a/lnrpc/rpc.pb.go b/lnrpc/rpc.pb.go
index 0c62b63d..dc4dba1e 100644
--- a/lnrpc/rpc.pb.go
+++ b/lnrpc/rpc.pb.go
@@ -387,9 +387,9 @@ func (*ChannelCloseUpdate) ProtoMessage()               {}
 func (*ChannelCloseUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
 
 type CloseChannelRequest struct {
-	ChannelPoint    *ChannelPoint `protobuf:"bytes,1,opt,name=channel_point" json:"channel_point,omitempty"`
-	TimeLimit       int64         `protobuf:"varint,2,opt,name=time_limit" json:"time_limit,omitempty"`
-	AllowForceClose bool          `protobuf:"varint,3,opt,name=allow_force_close" json:"allow_force_close,omitempty"`
+	ChannelPoint *ChannelPoint `protobuf:"bytes,1,opt,name=channel_point" json:"channel_point,omitempty"`
+	TimeLimit    int64         `protobuf:"varint,2,opt,name=time_limit" json:"time_limit,omitempty"`
+	Force        bool          `protobuf:"varint,3,opt,name=force" json:"force,omitempty"`
 }
 
 func (m *CloseChannelRequest) Reset()                    { *m = CloseChannelRequest{} }
@@ -1401,101 +1401,101 @@ var _Lightning_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("rpc.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1535 bytes of a gzipped FileDescriptorProto
+	// 1529 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0x5d, 0x6f, 0x13, 0x57,
 	0x13, 0xc6, 0xdf, 0xf6, 0xd8, 0x4e, 0xec, 0x93, 0x2f, 0xc7, 0xc0, 0xfb, 0xf2, 0xae, 0x00, 0xe5,
 	0x45, 0x21, 0x80, 0xe9, 0x05, 0x02, 0x95, 0x2a, 0x98, 0x94, 0x50, 0xd2, 0x24, 0xc5, 0x41, 0xa8,
-	0x57, 0xdb, 0xf5, 0xfa, 0x04, 0xaf, 0x58, 0xef, 0xba, 0x3e, 0xc7, 0x04, 0xf7, 0x07, 0xf4, 0xb6,
-	0xb7, 0xfd, 0x11, 0x55, 0xd5, 0xff, 0x50, 0xf5, 0xaa, 0x52, 0x7f, 0x53, 0xe7, 0x7c, 0xd9, 0xfb,
-	0xe1, 0x20, 0xf5, 0xa2, 0x57, 0xd6, 0xce, 0x99, 0x33, 0x1f, 0xcf, 0xcc, 0x79, 0x66, 0x0c, 0x95,
-	0xc9, 0xd8, 0xdd, 0x1b, 0x4f, 0x42, 0x1e, 0x92, 0x82, 0x1f, 0xe0, 0x87, 0xf5, 0x0d, 0x54, 0x7b,
-	0x34, 0x18, 0xbc, 0xa6, 0xdf, 0x4f, 0x29, 0xe3, 0xa4, 0x06, 0xf9, 0x01, 0xfe, 0xb6, 0x32, 0x37,
-	0x32, 0x3b, 0x35, 0x52, 0x85, 0x9c, 0x33, 0xe2, 0xad, 0x2c, 0x7e, 0xe4, 0xc8, 0x3a, 0xd4, 0xc6,
-	0xce, 0x6c, 0x44, 0x03, 0x6e, 0x0f, 0x1d, 0x36, 0x6c, 0xe5, 0xa4, 0x4a, 0x13, 0x2a, 0xe7, 0x0e,
-	0xe3, 0x36, 0x43, 0x23, 0xad, 0x3c, 0x8a, 0xca, 0xd6, 0x0a, 0xd4, 0x94, 0x49, 0x36, 0x0e, 0x03,
-	0x46, 0xad, 0xc7, 0x50, 0xeb, 0x0e, 0x9d, 0x20, 0xa0, 0xfe, 0x69, 0xe8, 0x05, 0x5c, 0x18, 0x3a,
-	0x9f, 0x06, 0x03, 0x2f, 0x78, 0x67, 0xf3, 0x8f, 0xde, 0x40, 0xfb, 0x42, 0x69, 0x38, 0xe5, 0xe3,
-	0x29, 0xb7, 0xbd, 0x60, 0x40, 0x3f, 0x4a, 0xa7, 0x75, 0xeb, 0x33, 0x68, 0x1c, 0x79, 0xef, 0x86,
-	0x3c, 0x40, 0xed, 0xfd, 0xc1, 0x60, 0x42, 0x19, 0x23, 0x04, 0x60, 0x3c, 0xed, 0xbf, 0xa2, 0xb3,
-	0x43, 0x11, 0x86, 0xb8, 0x5d, 0x11, 0x71, 0x0f, 0x43, 0xa6, 0x42, 0xad, 0x58, 0x3f, 0x66, 0x60,
-	0x55, 0x84, 0xf0, 0xb5, 0x13, 0xcc, 0x4c, 0x66, 0x4f, 0xa1, 0x26, 0x0c, 0x9c, 0x85, 0xfb, 0xa3,
-	0x70, 0x1a, 0x88, 0x0c, 0x73, 0x3b, 0xd5, 0xce, 0xce, 0x9e, 0x84, 0x61, 0x2f, 0xa1, 0xbd, 0x17,
-	0x55, 0x3d, 0x08, 0xf8, 0x64, 0xd6, 0x7e, 0x08, 0xcd, 0x94, 0x50, 0x00, 0xf4, 0x9e, 0xce, 0x74,
-	0x0c, 0x75, 0x28, 0x7c, 0x70, 0xfc, 0x29, 0x55, 0x78, 0x3d, 0xce, 0x3e, 0xca, 0x58, 0x37, 0xa0,
-	0xb1, 0xb0, 0xac, 0xe0, 0x10, 0xa1, 0xce, 0xd3, 0xae, 0x58, 0xf7, 0x95, 0x46, 0x17, 0x91, 0x61,
-	0x91, 0x22, 0x38, 0xe8, 0x4a, 0x9b, 0x5d, 0x81, 0xa2, 0xa3, 0x42, 0x96, 0x76, 0xad, 0xff, 0x41,
-	0x33, 0x72, 0x63, 0xa9, 0xd1, 0x9f, 0x33, 0xd0, 0x3c, 0xa6, 0x17, 0x1a, 0x30, 0x63, 0xb6, 0x83,
-	0x3a, 0xb3, 0x31, 0x95, 0x3a, 0x2b, 0x9d, 0x9b, 0x3a, 0xf3, 0x94, 0xde, 0x9e, 0xfe, 0x3c, 0x43,
-	0x5d, 0xeb, 0x04, 0xaa, 0x91, 0x4f, 0xb2, 0x05, 0x6b, 0x6f, 0x5f, 0x9e, 0x1d, 0x1f, 0xf4, 0x7a,
-	0xf6, 0xe9, 0x9b, 0x67, 0xaf, 0x0e, 0xbe, 0xb5, 0x0f, 0xf7, 0x7b, 0x87, 0x8d, 0x2b, 0x64, 0x13,
-	0x08, 0x4a, 0xcf, 0x0e, 0x9e, 0xc7, 0xe4, 0x19, 0xb2, 0x0a, 0xd5, 0xa8, 0x20, 0x6b, 0xdd, 0x42,
-	0xc5, 0x88, 0x47, 0x1d, 0xfe, 0x2a, 0x94, 0x1c, 0x25, 0xd2, 0x19, 0x3c, 0x01, 0xd2, 0x0d, 0xb1,
-	0x65, 0x5c, 0x7e, 0x4a, 0xe9, 0xc4, 0x64, 0x70, 0x2b, 0x02, 0x4c, 0xb5, 0xb3, 0xa5, 0x33, 0x48,
-	0x36, 0x88, 0x75, 0x1b, 0xd6, 0x62, 0x97, 0x17, 0x4e, 0xc6, 0xf8, 0x6d, 0x6b, 0x98, 0x0a, 0xd6,
-	0x73, 0xc8, 0x1f, 0x9e, 0x1d, 0x75, 0xb1, 0x9f, 0xb2, 0x5a, 0x96, 0x4b, 0xa2, 0x2d, 0xfa, 0x5b,
-	0x74, 0xbb, 0xed, 0x87, 0xee, 0x7b, 0xdd, 0xf2, 0x58, 0x67, 0x1e, 0xda, 0x53, 0xa6, 0xdb, 0xfd,
-	0xaf, 0x0c, 0xd4, 0xf7, 0x5d, 0xee, 0x7d, 0xa0, 0xba, 0xcb, 0xc5, 0x9d, 0x09, 0x1d, 0x85, 0x9c,
-	0x1a, 0x57, 0x15, 0xb2, 0x01, 0x75, 0x57, 0x9d, 0xda, 0x63, 0xf1, 0x08, 0x54, 0xa3, 0x92, 0x06,
-	0x94, 0x5d, 0x67, 0xec, 0xb8, 0x1e, 0x9f, 0x49, 0xe3, 0x39, 0xa1, 0x88, 0xae, 0x1c, 0xdf, 0xee,
-	0x3b, 0xbe, 0x13, 0xb8, 0x54, 0x3a, 0xc9, 0x21, 0xbe, 0x2b, 0xda, 0xa4, 0x91, 0x17, 0xa4, 0x7c,
-	0x1b, 0x9a, 0x53, 0xcc, 0x8d, 0x73, 0x9f, 0x0e, 0xec, 0x3e, 0x55, 0x47, 0x45, 0x79, 0x64, 0x41,
-	0x7d, 0x4c, 0xd5, 0x33, 0x1b, 0x72, 0xdf, 0x65, 0xad, 0x92, 0xec, 0xf8, 0xaa, 0x46, 0x4d, 0x66,
-	0xbe, 0x06, 0xd5, 0x60, 0x3a, 0xb2, 0xa7, 0xe3, 0x81, 0xc3, 0x29, 0x6b, 0x95, 0xf1, 0x62, 0xde,
-	0xfa, 0x3d, 0x03, 0x79, 0x01, 0x9c, 0x78, 0x92, 0xbe, 0xc1, 0x76, 0x91, 0x4a, 0x04, 0x46, 0x91,
-	0x44, 0x21, 0x5a, 0xbc, 0x9c, 0xd4, 0x40, 0x40, 0xfb, 0x33, 0xb4, 0x27, 0x48, 0x81, 0xcb, 0x04,
-	0xf2, 0x0b, 0xd9, 0x84, 0xba, 0x1f, 0x64, 0xf0, 0x79, 0x91, 0x3d, 0x73, 0xb8, 0xd2, 0x52, 0x31,
-	0x6b, 0x89, 0xd4, 0x29, 0x49, 0x09, 0x1a, 0xf7, 0x82, 0x3e, 0x16, 0x64, 0x20, 0xa3, 0x2b, 0x93,
-	0xdb, 0x08, 0x99, 0x42, 0x92, 0xb5, 0x2a, 0x32, 0xa3, 0x75, 0x9d, 0x51, 0xac, 0x08, 0x16, 0x11,
-	0xcc, 0xc1, 0x64, 0x07, 0x98, 0xce, 0xb6, 0xee, 0x41, 0x33, 0x22, 0xd3, 0x6d, 0xd1, 0x86, 0x82,
-	0xc8, 0x87, 0x69, 0x46, 0x30, 0xf8, 0x08, 0x25, 0xab, 0x01, 0x2b, 0x2f, 0x28, 0x7f, 0x19, 0x9c,
-	0x87, 0xc6, 0xc4, 0x4f, 0x48, 0x2d, 0x73, 0x91, 0xb6, 0xb0, 0x1c, 0xa7, 0x16, 0x34, 0xbc, 0x01,
-	0xa6, 0x86, 0xb5, 0xb5, 0x0d, 0x3e, 0xaa, 0xea, 0xd7, 0x60, 0x5d, 0xa0, 0x6e, 0xaa, 0x33, 0x4f,
-	0x47, 0xa0, 0x57, 0x27, 0x57, 0x61, 0x4d, 0x9c, 0x3a, 0x32, 0x9b, 0xc5, 0x61, 0x5e, 0x1e, 0x62,
-	0x6b, 0xa9, 0xab, 0x22, 0xe0, 0x82, 0xa4, 0xc8, 0x37, 0xf2, 0xa9, 0x9c, 0x7b, 0x93, 0x91, 0xc3,
-	0xbd, 0x30, 0x78, 0x23, 0x6b, 0x29, 0x14, 0xfb, 0xa2, 0x67, 0x6d, 0x36, 0x74, 0x16, 0x0c, 0xab,
-	0x44, 0x43, 0x2a, 0xa2, 0xd5, 0xd5, 0xc3, 0xce, 0x12, 0x16, 0x5d, 0x34, 0xc1, 0x6c, 0x9f, 0x9e,
-	0x73, 0x15, 0x86, 0xf5, 0x05, 0x34, 0x35, 0x94, 0x27, 0x18, 0xa8, 0xb6, 0x7a, 0x27, 0xd9, 0xc6,
-	0xea, 0x25, 0xae, 0x69, 0xcc, 0xa2, 0x34, 0x2f, 0x9f, 0xb0, 0xfa, 0xee, 0xfa, 0x21, 0xa3, 0xda,
-	0x02, 0x06, 0xe1, 0xe2, 0x67, 0x82, 0xfc, 0xb1, 0xca, 0x6c, 0xea, 0xba, 0x06, 0xa2, 0xb2, 0x35,
-	0xc6, 0x27, 0x2c, 0x6e, 0x69, 0x0b, 0x86, 0x00, 0xfe, 0x81, 0x7f, 0xd1, 0x71, 0xdc, 0x1b, 0x51,
-	0xdb, 0xf7, 0x46, 0x9e, 0x79, 0xcd, 0xf8, 0x5c, 0x1c, 0xdf, 0x0f, 0x2f, 0xec, 0xf3, 0x70, 0xe2,
-	0x22, 0xb8, 0xc2, 0x85, 0xcc, 0xb7, 0x6c, 0xfd, 0x86, 0x9c, 0x29, 0x5d, 0xf6, 0xb8, 0xc3, 0xa7,
-	0x4c, 0x87, 0x7b, 0x17, 0x1d, 0x0a, 0xa1, 0x29, 0x96, 0x76, 0xb8, 0x3e, 0x6f, 0x12, 0x29, 0x55,
-	0xca, 0x87, 0x57, 0xc8, 0x03, 0xcc, 0x2e, 0x52, 0x0b, 0xe9, 0xb5, 0xda, 0xd9, 0x36, 0xe1, 0xa5,
-	0xca, 0x84, 0x57, 0xee, 0x01, 0x88, 0x94, 0x22, 0xb1, 0x44, 0x2e, 0xa4, 0xf0, 0x3b, 0xbc, 0xf2,
-	0xac, 0x0c, 0x45, 0xf5, 0x5e, 0xad, 0xeb, 0x50, 0x8f, 0x05, 0x10, 0x9b, 0x02, 0x35, 0xf1, 0x8e,
-	0x89, 0xa8, 0x5d, 0x02, 0x43, 0x2c, 0x38, 0x77, 0x26, 0xef, 0x28, 0xb7, 0x63, 0x6c, 0x48, 0x76,
-	0xa1, 0xaa, 0xe5, 0x41, 0x38, 0xa0, 0x3a, 0xf4, 0xcb, 0x38, 0x56, 0xf4, 0xb0, 0xe2, 0x29, 0x33,
-	0xca, 0x35, 0x6b, 0x2a, 0x16, 0xbb, 0x0e, 0x1b, 0x9a, 0xae, 0x12, 0xc7, 0x8a, 0xcd, 0xb6, 0x60,
-	0xd5, 0x0d, 0x47, 0x23, 0x8f, 0x31, 0x44, 0xc2, 0x66, 0xde, 0x0f, 0x86, 0xce, 0x74, 0x7b, 0xcb,
-	0x66, 0x94, 0x94, 0x50, 0xb7, 0x7e, 0xc9, 0x40, 0x43, 0x64, 0x11, 0x2b, 0xcb, 0x2e, 0xe2, 0x2c,
-	0x40, 0xfb, 0xd7, 0xaa, 0x72, 0x17, 0x2a, 0xd2, 0x41, 0x88, 0x1e, 0x74, 0x51, 0x5a, 0xf1, 0xa2,
-	0x2c, 0x5e, 0x45, 0xac, 0x26, 0x9f, 0xc3, 0x86, 0x76, 0x9f, 0x80, 0xfd, 0x26, 0x14, 0x99, 0x4c,
-	0x41, 0xcf, 0xdf, 0xf5, 0xb8, 0x39, 0x95, 0x9e, 0xf5, 0x6b, 0x16, 0x36, 0x93, 0xf7, 0x35, 0xcb,
-	0x7c, 0x09, 0x8d, 0x14, 0x63, 0x28, 0xca, 0xda, 0x8d, 0xe7, 0x9d, 0xb8, 0x98, 0x10, 0xb7, 0xff,
-	0xcc, 0xc0, 0x4a, 0x5c, 0x94, 0x9a, 0x8c, 0x29, 0x46, 0xcb, 0x2e, 0x1f, 0x62, 0xb9, 0xd4, 0x10,
-	0xcb, 0x2f, 0x1f, 0x62, 0x85, 0x4b, 0x86, 0x58, 0xd1, 0x6c, 0x96, 0x31, 0x4e, 0x28, 0x49, 0xb3,
-	0x0b, 0xc0, 0xca, 0x9f, 0x00, 0x6c, 0x17, 0xd6, 0xdf, 0xe2, 0x93, 0xa6, 0xfc, 0x99, 0x32, 0x69,
-	0xe0, 0x46, 0x9b, 0x17, 0x1e, 0x0f, 0xb0, 0x55, 0xed, 0x30, 0xf0, 0xd5, 0x8a, 0x56, 0xb6, 0x76,
-	0x60, 0x23, 0xa1, 0xbd, 0xd8, 0x0d, 0x4c, 0x4c, 0x42, 0x33, 0x63, 0x7d, 0x07, 0x8d, 0xd7, 0xb8,
-	0x8f, 0x62, 0x4c, 0x67, 0x4e, 0xdf, 0xa7, 0x47, 0x5e, 0xf0, 0x5e, 0x6c, 0x7b, 0xde, 0xe0, 0x81,
-	0xa6, 0x77, 0xf9, 0xd1, 0x59, 0xcc, 0x71, 0xb1, 0xbc, 0x7e, 0x12, 0x14, 0xdc, 0x2c, 0x2e, 0x14,
-	0xf1, 0x16, 0xa4, 0x87, 0x6d, 0xd8, 0xea, 0x0d, 0xc3, 0x8b, 0xa8, 0x17, 0x33, 0x64, 0x0e, 0xa0,
-	0x95, 0x3e, 0xd2, 0x91, 0xfe, 0x3f, 0x32, 0xff, 0x54, 0xf9, 0xcd, 0x1b, 0x4d, 0xc6, 0x7b, 0xa7,
-	0x03, 0xf5, 0x18, 0x58, 0xa4, 0x04, 0xb9, 0xfd, 0xa3, 0x23, 0x5c, 0xd7, 0xaa, 0x50, 0x3a, 0x39,
-	0x3d, 0x38, 0x7e, 0x79, 0xfc, 0x02, 0x77, 0x34, 0xfc, 0xe8, 0x1e, 0x9d, 0xf4, 0xc4, 0x47, 0xb6,
-	0xf3, 0x47, 0x11, 0x2a, 0xf3, 0xc7, 0x4e, 0xbe, 0x82, 0x7a, 0x0c, 0x2f, 0x72, 0x55, 0xfb, 0x5a,
-	0x86, 0x79, 0xfb, 0xda, 0xf2, 0x43, 0x1d, 0xf8, 0x13, 0x28, 0x9b, 0x5d, 0x98, 0x6c, 0x2e, 0x5f,
-	0xbb, 0xdb, 0x5b, 0x29, 0xb9, 0xbe, 0xfc, 0x14, 0x2a, 0xf3, 0xa5, 0x97, 0x44, 0xb5, 0xa2, 0x8b,
-	0x73, 0xbb, 0x95, 0x3e, 0xd0, 0xf7, 0xf7, 0x01, 0x16, 0x6b, 0x27, 0x69, 0x5d, 0xb6, 0xfb, 0xb6,
-	0xb7, 0x97, 0x9c, 0x68, 0x13, 0xcf, 0xa1, 0x1a, 0xd9, 0x2a, 0x49, 0x84, 0x3e, 0x12, 0x6b, 0x6a,
-	0xbb, 0xbd, 0xec, 0x68, 0x91, 0xc8, 0x7c, 0x05, 0x21, 0x0b, 0x76, 0x8d, 0x2f, 0x2a, 0xf3, 0x44,
-	0xd2, 0xdb, 0xca, 0x23, 0x28, 0xe9, 0xf5, 0x83, 0x6c, 0x68, 0xa5, 0xf8, 0x86, 0xd2, 0xde, 0x4c,
-	0x8a, 0xf5, 0xcd, 0x2e, 0x54, 0x23, 0xd3, 0x60, 0x1e, 0x7f, 0x7a, 0x42, 0xcc, 0xab, 0x90, 0xa4,
-	0xdd, 0xfb, 0x19, 0x24, 0xa1, 0x5a, 0x74, 0x2e, 0x93, 0x79, 0xaa, 0xe9, 0x61, 0x3d, 0x4f, 0x22,
-	0x35, 0x55, 0xd1, 0xce, 0x31, 0xac, 0xc6, 0x39, 0x08, 0x27, 0xca, 0x25, 0x2c, 0xa6, 0x8c, 0x5d,
-	0xff, 0x24, 0xc7, 0x91, 0xc7, 0xea, 0x6f, 0xec, 0xa9, 0xfa, 0x83, 0x4a, 0x48, 0xa4, 0x11, 0x8c,
-	0x85, 0xb5, 0x98, 0x4c, 0xdd, 0xdb, 0xc9, 0x60, 0x2c, 0x3d, 0xfc, 0x0b, 0x96, 0x78, 0x6d, 0xe4,
-	0x3f, 0x46, 0x79, 0xf9, 0x0b, 0x6d, 0xff, 0xf7, 0xd2, 0x73, 0x65, 0xb8, 0x5f, 0x94, 0xff, 0xb2,
-	0x1f, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x68, 0x21, 0x22, 0x40, 0x72, 0x0f, 0x00, 0x00,
+	0x57, 0xdb, 0xf5, 0xee, 0x09, 0x5e, 0xb1, 0xde, 0x75, 0xbd, 0xc7, 0x04, 0xf7, 0x07, 0xf4, 0xb6,
+	0xb7, 0xfd, 0x11, 0x55, 0xd5, 0xff, 0x50, 0xf5, 0xaa, 0x52, 0x7f, 0x53, 0xe7, 0x7c, 0x79, 0xbf,
+	0x1c, 0xa4, 0x5e, 0xf4, 0xca, 0xda, 0x39, 0x73, 0xe6, 0xe3, 0x99, 0x99, 0xe7, 0x8c, 0xa1, 0x36,
+	0x9d, 0xd8, 0x7b, 0x93, 0x69, 0xc0, 0x02, 0x52, 0xf2, 0x7c, 0xfc, 0x30, 0xbe, 0x81, 0xfa, 0x80,
+	0xfa, 0xce, 0x6b, 0xfa, 0xfd, 0x8c, 0x86, 0x8c, 0x34, 0xa0, 0xe8, 0xe0, 0x6f, 0x27, 0x77, 0x23,
+	0xb7, 0xd3, 0x20, 0x75, 0x28, 0x58, 0x63, 0xd6, 0xc9, 0xe3, 0x47, 0x81, 0xac, 0x43, 0x63, 0x62,
+	0xcd, 0xc7, 0xd4, 0x67, 0xe6, 0xc8, 0x0a, 0x47, 0x9d, 0x82, 0x50, 0x69, 0x43, 0xed, 0xdc, 0x0a,
+	0x99, 0x19, 0xa2, 0x91, 0x4e, 0x11, 0x45, 0x55, 0x63, 0x05, 0x1a, 0xd2, 0x64, 0x38, 0x09, 0xfc,
+	0x90, 0x1a, 0x8f, 0xa1, 0xd1, 0x1f, 0x59, 0xbe, 0x4f, 0xbd, 0xd3, 0xc0, 0xf5, 0x19, 0x37, 0x74,
+	0x3e, 0xf3, 0x1d, 0xd7, 0x7f, 0x67, 0xb2, 0x8f, 0xae, 0xa3, 0x7c, 0xa1, 0x34, 0x98, 0xb1, 0xc9,
+	0x8c, 0x99, 0xae, 0xef, 0xd0, 0x8f, 0xc2, 0x69, 0xd3, 0xf8, 0x0c, 0x5a, 0x47, 0xee, 0xbb, 0x11,
+	0xf3, 0x51, 0x7b, 0xdf, 0x71, 0xa6, 0x34, 0x0c, 0x09, 0x01, 0x98, 0xcc, 0x86, 0xaf, 0xe8, 0xfc,
+	0x90, 0x87, 0xc1, 0x6f, 0xd7, 0x78, 0xdc, 0xa3, 0x20, 0x94, 0xa1, 0xd6, 0x8c, 0x1f, 0x73, 0xb0,
+	0xca, 0x43, 0xf8, 0xda, 0xf2, 0xe7, 0x3a, 0xb3, 0xa7, 0xd0, 0xe0, 0x06, 0xce, 0x82, 0xfd, 0x71,
+	0x30, 0xf3, 0x79, 0x86, 0x85, 0x9d, 0x7a, 0x6f, 0x67, 0x4f, 0xc0, 0xb0, 0x97, 0xd2, 0xde, 0x8b,
+	0xab, 0x1e, 0xf8, 0x6c, 0x3a, 0xef, 0x3e, 0x84, 0x76, 0x46, 0xc8, 0x01, 0x7a, 0x4f, 0xe7, 0x2a,
+	0x86, 0x26, 0x94, 0x3e, 0x58, 0xde, 0x8c, 0x4a, 0xbc, 0x1e, 0xe7, 0x1f, 0xe5, 0x8c, 0x1b, 0xd0,
+	0x8a, 0x2c, 0x4b, 0x38, 0x78, 0xa8, 0x8b, 0xb4, 0x6b, 0xc6, 0x7d, 0xa9, 0xd1, 0x47, 0x64, 0xc2,
+	0x58, 0x11, 0x2c, 0x74, 0xa5, 0xcc, 0xae, 0x40, 0xd9, 0x92, 0x21, 0x0b, 0xbb, 0xc6, 0xff, 0xa0,
+	0x1d, 0xbb, 0xb1, 0xd4, 0xe8, 0xcf, 0x39, 0x68, 0x1f, 0xd3, 0x0b, 0x05, 0x98, 0x36, 0xdb, 0x43,
+	0x9d, 0xf9, 0x84, 0x0a, 0x9d, 0x95, 0xde, 0x4d, 0x95, 0x79, 0x46, 0x6f, 0x4f, 0x7d, 0x9e, 0xa1,
+	0xae, 0x71, 0x02, 0xf5, 0xd8, 0x27, 0xd9, 0x82, 0xb5, 0xb7, 0x2f, 0xcf, 0x8e, 0x0f, 0x06, 0x03,
+	0xf3, 0xf4, 0xcd, 0xb3, 0x57, 0x07, 0xdf, 0x9a, 0x87, 0xfb, 0x83, 0xc3, 0xd6, 0x15, 0xb2, 0x09,
+	0x04, 0xa5, 0x67, 0x07, 0xcf, 0x13, 0xf2, 0x1c, 0x59, 0x85, 0x7a, 0x5c, 0x90, 0x37, 0x6e, 0xa1,
+	0x62, 0xcc, 0xa3, 0x0a, 0x7f, 0x15, 0x2a, 0x96, 0x14, 0xa9, 0x0c, 0x9e, 0x00, 0xe9, 0x07, 0xd8,
+	0x32, 0x36, 0x3b, 0xa5, 0x74, 0xaa, 0x33, 0xb8, 0x15, 0x03, 0xa6, 0xde, 0xdb, 0x52, 0x19, 0xa4,
+	0x1b, 0xc4, 0xb8, 0x0d, 0x6b, 0x89, 0xcb, 0x91, 0x93, 0x09, 0x7e, 0x9b, 0x0a, 0xa6, 0x92, 0xf1,
+	0x1c, 0x8a, 0x87, 0x67, 0x47, 0x7d, 0xec, 0xa7, 0xbc, 0x92, 0x15, 0xd2, 0x68, 0xf3, 0xfe, 0xe6,
+	0xdd, 0x6e, 0x7a, 0x81, 0xfd, 0x5e, 0xb5, 0x3c, 0xd6, 0x99, 0x05, 0xe6, 0x2c, 0x54, 0xed, 0xfe,
+	0x57, 0x0e, 0x9a, 0xfb, 0x36, 0x73, 0x3f, 0x50, 0xd5, 0xe5, 0xfc, 0xce, 0x94, 0x8e, 0x03, 0x46,
+	0xb5, 0xab, 0x1a, 0xd9, 0x80, 0xa6, 0x2d, 0x4f, 0xcd, 0x09, 0x1f, 0x02, 0xd9, 0xa8, 0xa4, 0x05,
+	0x55, 0xdb, 0x9a, 0x58, 0xb6, 0xcb, 0xe6, 0xc2, 0x78, 0x81, 0x2b, 0xa2, 0x2b, 0xcb, 0x33, 0x87,
+	0x96, 0x67, 0xf9, 0x36, 0x15, 0x4e, 0x0a, 0x88, 0xef, 0x8a, 0x32, 0xa9, 0xe5, 0x25, 0x21, 0xdf,
+	0x86, 0xf6, 0x0c, 0x73, 0x63, 0xcc, 0xa3, 0x8e, 0x39, 0xa4, 0xf2, 0xa8, 0x2c, 0x8e, 0x0c, 0x68,
+	0x4e, 0xa8, 0x1c, 0xb3, 0x11, 0xf3, 0xec, 0xb0, 0x53, 0x11, 0x1d, 0x5f, 0x57, 0xa8, 0x89, 0xcc,
+	0xd7, 0xa0, 0xee, 0xcf, 0xc6, 0xe6, 0x6c, 0xe2, 0x58, 0x8c, 0x86, 0x9d, 0x2a, 0x5e, 0x2c, 0x1a,
+	0xbf, 0xe7, 0xa0, 0xc8, 0x81, 0xe3, 0x23, 0xe9, 0x69, 0x6c, 0xa3, 0x54, 0x62, 0x30, 0xf2, 0x24,
+	0x4a, 0xf1, 0xe2, 0x15, 0x84, 0x06, 0x02, 0x3a, 0x9c, 0xa3, 0x3d, 0x4e, 0x0a, 0x4c, 0x24, 0x50,
+	0x8c, 0x64, 0x53, 0x6a, 0x7f, 0x10, 0xc1, 0x17, 0x79, 0xf6, 0xa1, 0xc5, 0xa4, 0x96, 0x8c, 0x59,
+	0x49, 0x84, 0x4e, 0x45, 0x48, 0xd0, 0xb8, 0xeb, 0x0f, 0xb1, 0x20, 0x8e, 0x88, 0xae, 0x4a, 0x6e,
+	0x23, 0x64, 0x12, 0xc9, 0xb0, 0x53, 0x13, 0x19, 0xad, 0xab, 0x8c, 0x12, 0x45, 0x30, 0x08, 0x67,
+	0x8e, 0x50, 0x74, 0x80, 0xee, 0x6c, 0xe3, 0x1e, 0xb4, 0x63, 0x32, 0xd5, 0x16, 0x5d, 0x28, 0xf1,
+	0x7c, 0x42, 0xc5, 0x08, 0x1a, 0x1f, 0xae, 0x64, 0xb4, 0x60, 0xe5, 0x05, 0x65, 0x2f, 0xfd, 0xf3,
+	0x40, 0x9b, 0xf8, 0x09, 0xa9, 0x65, 0x21, 0x52, 0x16, 0x96, 0xe3, 0xd4, 0x81, 0x96, 0xeb, 0x60,
+	0x6a, 0x58, 0x5b, 0x53, 0xe3, 0x23, 0xab, 0x7e, 0x0d, 0xd6, 0x39, 0xea, 0xba, 0x3a, 0x8b, 0x74,
+	0x38, 0x7a, 0x4d, 0x72, 0x15, 0xd6, 0xf8, 0xa9, 0x25, 0xb2, 0x89, 0x0e, 0x8b, 0xe2, 0x10, 0x5b,
+	0x4b, 0x5e, 0xe5, 0x01, 0x97, 0x04, 0x45, 0xbe, 0x11, 0xa3, 0x72, 0xee, 0x4e, 0xc7, 0x16, 0x73,
+	0x03, 0xff, 0x8d, 0xa8, 0x25, 0x57, 0x1c, 0xf2, 0x9e, 0x35, 0xc3, 0x91, 0x15, 0x31, 0xac, 0x14,
+	0x8d, 0x28, 0x8f, 0x56, 0x55, 0x0f, 0x3b, 0x8b, 0x5b, 0xb4, 0xd1, 0x44, 0x68, 0x7a, 0xf4, 0x9c,
+	0xc9, 0x30, 0x8c, 0x2f, 0xa0, 0xad, 0xa0, 0x3c, 0xc1, 0x40, 0x95, 0xd5, 0x3b, 0xe9, 0x36, 0x96,
+	0x93, 0xb8, 0xa6, 0x30, 0x8b, 0xd3, 0xbc, 0x18, 0x61, 0xf9, 0xdd, 0xf7, 0x82, 0x90, 0x2a, 0x0b,
+	0x18, 0x84, 0x8d, 0x9f, 0x29, 0xf2, 0xc7, 0x2a, 0x87, 0x33, 0xdb, 0xd6, 0x10, 0x55, 0x0d, 0x07,
+	0x47, 0x98, 0xdf, 0x52, 0x16, 0x34, 0x01, 0xfc, 0x03, 0xff, 0xbc, 0xe3, 0x98, 0x3b, 0xa6, 0xa6,
+	0xe7, 0x8e, 0x5d, 0x3d, 0xcd, 0x38, 0xba, 0xe7, 0xc1, 0x14, 0x47, 0xa4, 0x20, 0xbc, 0xfc, 0x86,
+	0x3c, 0x29, 0xdc, 0x0c, 0x98, 0xc5, 0x66, 0xa1, 0x0a, 0xf1, 0x2e, 0x3a, 0xe1, 0x42, 0x5d, 0x20,
+	0xe5, 0x64, 0x7d, 0xd1, 0x18, 0x42, 0x2a, 0x95, 0x0f, 0xaf, 0x90, 0x07, 0x98, 0x51, 0x0c, 0x7f,
+	0xe1, 0xa9, 0xde, 0xdb, 0xd6, 0x21, 0x65, 0x4a, 0x83, 0x57, 0xee, 0x01, 0xf0, 0x34, 0x4c, 0xe1,
+	0x46, 0xc4, 0x12, 0xbb, 0x90, 0xc1, 0xec, 0xf0, 0xca, 0xb3, 0x2a, 0x94, 0xe5, 0x8c, 0x1a, 0xd7,
+	0xa1, 0x99, 0x08, 0x20, 0xc1, 0xfc, 0x0d, 0x3e, 0xbb, 0x84, 0xd7, 0x2b, 0x85, 0x1b, 0x16, 0x99,
+	0x59, 0xd3, 0x77, 0x94, 0x99, 0x09, 0x06, 0x24, 0xbb, 0x50, 0x57, 0x72, 0x3f, 0x70, 0xa8, 0x0a,
+	0xfd, 0x32, 0x5e, 0xe5, 0x7d, 0x2b, 0xb9, 0x49, 0x3f, 0xdf, 0x8a, 0x29, 0x25, 0x73, 0x5d, 0x87,
+	0x0d, 0x45, 0x51, 0xa9, 0x63, 0xc9, 0x60, 0x5b, 0xb0, 0x6a, 0x07, 0xe3, 0xb1, 0x1b, 0x86, 0x88,
+	0x84, 0x19, 0xba, 0x3f, 0x68, 0x0a, 0x53, 0x2d, 0x2d, 0x1a, 0x50, 0xd0, 0x40, 0xd3, 0xf8, 0x25,
+	0x07, 0x2d, 0x9e, 0x45, 0xa2, 0x2c, 0xbb, 0x88, 0x33, 0x07, 0xed, 0x5f, 0xab, 0xca, 0x5d, 0xa8,
+	0x09, 0x07, 0x01, 0x7a, 0x50, 0x45, 0xe9, 0x24, 0x8b, 0x12, 0x4d, 0x42, 0xa2, 0x26, 0x9f, 0xc3,
+	0x86, 0x72, 0x9f, 0x82, 0xfd, 0x26, 0x94, 0x43, 0x91, 0x82, 0x7a, 0x73, 0xd7, 0x93, 0xe6, 0x64,
+	0x7a, 0xc6, 0xaf, 0x79, 0xd8, 0x4c, 0xdf, 0x57, 0xcc, 0xf2, 0x25, 0xb4, 0x32, 0x2c, 0x21, 0x69,
+	0x6a, 0x37, 0x99, 0x77, 0xea, 0x62, 0x4a, 0xdc, 0xfd, 0x33, 0x07, 0x2b, 0x49, 0x51, 0xe6, 0x35,
+	0xcc, 0xb0, 0x58, 0x7e, 0xf9, 0xc3, 0x55, 0xc8, 0x3c, 0x5c, 0xc5, 0xe5, 0x0f, 0x57, 0xe9, 0x92,
+	0x87, 0xab, 0xac, 0xb7, 0xc9, 0x04, 0x0f, 0x54, 0x84, 0xd9, 0x08, 0xb0, 0xea, 0x27, 0x00, 0xdb,
+	0x85, 0xf5, 0xb7, 0x96, 0xe7, 0x51, 0xf6, 0x4c, 0x9a, 0xd4, 0x70, 0xa3, 0xcd, 0x0b, 0x97, 0xf9,
+	0xd8, 0xaa, 0x66, 0xe0, 0x7b, 0x72, 0x2d, 0xab, 0x1a, 0x3b, 0xb0, 0x91, 0xd2, 0x8e, 0xf6, 0x01,
+	0x1d, 0x13, 0xd7, 0xcc, 0x19, 0xdf, 0x41, 0xeb, 0x35, 0xee, 0xa0, 0x18, 0xd3, 0x99, 0x35, 0xf4,
+	0xe8, 0x91, 0xeb, 0xbf, 0xe7, 0x1b, 0x9e, 0xeb, 0x3c, 0x50, 0x94, 0x2e, 0x3e, 0x7a, 0xd1, 0xdb,
+	0xcd, 0x17, 0xd6, 0x4f, 0x82, 0x82, 0xdb, 0xc4, 0x85, 0x24, 0xdb, 0x92, 0xf0, 0xb0, 0x0d, 0x5b,
+	0x83, 0x51, 0x70, 0x11, 0xf7, 0xa2, 0x1f, 0x96, 0x03, 0xe8, 0x64, 0x8f, 0x54, 0xa4, 0xff, 0x8f,
+	0xbd, 0x79, 0xb2, 0xfc, 0x7a, 0x46, 0xd3, 0xf1, 0xde, 0xe9, 0x41, 0x33, 0x01, 0x16, 0xa9, 0x40,
+	0x61, 0xff, 0xe8, 0x08, 0x57, 0xb4, 0x3a, 0x54, 0x4e, 0x4e, 0x0f, 0x8e, 0x5f, 0x1e, 0xbf, 0xc0,
+	0xbd, 0x0c, 0x3f, 0xfa, 0x47, 0x27, 0x03, 0xfe, 0x91, 0xef, 0xfd, 0x51, 0x86, 0xda, 0x62, 0xd8,
+	0xc9, 0x57, 0xd0, 0x4c, 0xe0, 0x45, 0xae, 0x2a, 0x5f, 0xcb, 0x30, 0xef, 0x5e, 0x5b, 0x7e, 0xa8,
+	0x02, 0x7f, 0x02, 0x55, 0xbd, 0xff, 0x92, 0xcd, 0xe5, 0xab, 0x76, 0x77, 0x2b, 0x23, 0x57, 0x97,
+	0x9f, 0x42, 0x6d, 0xb1, 0xe8, 0x92, 0xb8, 0x56, 0x7c, 0x59, 0xee, 0x76, 0xb2, 0x07, 0xea, 0xfe,
+	0x3e, 0x40, 0xb4, 0x6a, 0x92, 0xce, 0x65, 0xfb, 0x6e, 0x77, 0x7b, 0xc9, 0x89, 0x32, 0xf1, 0x1c,
+	0xea, 0xb1, 0x4d, 0x92, 0xc4, 0xe8, 0x23, 0xb5, 0x9a, 0x76, 0xbb, 0xcb, 0x8e, 0xa2, 0x44, 0x16,
+	0x6b, 0x07, 0x89, 0xd8, 0x35, 0xb9, 0x9c, 0x2c, 0x12, 0xc9, 0x6e, 0x28, 0x8f, 0xa0, 0xa2, 0x56,
+	0x0e, 0xb2, 0xa1, 0x94, 0x92, 0x5b, 0x49, 0x77, 0x33, 0x2d, 0x56, 0x37, 0xfb, 0x50, 0x8f, 0xbd,
+	0x06, 0x8b, 0xf8, 0xb3, 0x2f, 0xc4, 0xa2, 0x0a, 0x69, 0xda, 0xbd, 0x9f, 0x43, 0x12, 0x6a, 0xc4,
+	0xdf, 0x62, 0xb2, 0x48, 0x35, 0xfb, 0x40, 0x2f, 0x92, 0xc8, 0xbc, 0xaa, 0x68, 0xe7, 0x18, 0x56,
+	0x93, 0x1c, 0x84, 0x2f, 0xca, 0x25, 0x2c, 0x26, 0x8d, 0x5d, 0xff, 0x24, 0xc7, 0x91, 0xc7, 0xf2,
+	0xaf, 0xeb, 0xa9, 0xfc, 0x53, 0x4a, 0x48, 0xac, 0x11, 0xb4, 0x85, 0xb5, 0x84, 0x4c, 0xde, 0xdb,
+	0xc9, 0x61, 0x2c, 0x03, 0xfc, 0xdb, 0x95, 0x9a, 0x36, 0xf2, 0x1f, 0xad, 0xbc, 0x7c, 0x42, 0xbb,
+	0xff, 0xbd, 0xf4, 0x5c, 0x1a, 0x1e, 0x96, 0xc5, 0x3f, 0xeb, 0x87, 0x7f, 0x07, 0x00, 0x00, 0xff,
+	0xff, 0xd6, 0x03, 0xf0, 0xf0, 0x66, 0x0f, 0x00, 0x00,
 }
diff --git a/lnrpc/rpc.proto b/lnrpc/rpc.proto
index c2fccfc1..038177ff 100644
--- a/lnrpc/rpc.proto
+++ b/lnrpc/rpc.proto
@@ -155,7 +155,7 @@ message ChannelCloseUpdate {
 message CloseChannelRequest {
     ChannelPoint channel_point = 1;
     int64 time_limit = 2;
-    bool allow_force_close = 3;
+    bool force = 3;
 }
 message CloseStatusUpdate {
     oneof update {