diff --git a/looprpc/client.pb.go b/looprpc/client.pb.go
index 5574df0..304fdab 100644
--- a/looprpc/client.pb.go
+++ b/looprpc/client.pb.go
@@ -673,7 +673,7 @@ func (m *ListSwapsResponse) GetSwaps() []*SwapStatus {
 type SwapInfoRequest struct {
 	//*
 	//The swap identifier which currently is the hash that locks the HTLCs. When
-	//using REST, this field must be encoded as base64.
+	//using REST, this field must be encoded as URL safe base64.
 	Id                   []byte   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -1164,98 +1164,97 @@ func init() {
 func init() { proto.RegisterFile("client.proto", fileDescriptor_014de31d7ac8c57c) }
 
 var fileDescriptor_014de31d7ac8c57c = []byte{
-	// 1445 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcd, 0x6e, 0xdb, 0xc6,
-	0x1a, 0x0d, 0x25, 0xd9, 0xa2, 0x3e, 0x51, 0x14, 0x3d, 0x4e, 0x6c, 0x59, 0xf7, 0x06, 0x71, 0x78,
-	0x6f, 0xee, 0x75, 0xbc, 0x88, 0x1a, 0x67, 0x17, 0x14, 0x05, 0x1c, 0x59, 0x89, 0x65, 0xf8, 0xaf,
-	0x94, 0x1c, 0x20, 0xd9, 0x30, 0x63, 0x71, 0x6c, 0x13, 0x15, 0x39, 0x0c, 0x67, 0x94, 0xd8, 0x08,
-	0xb2, 0xe9, 0x03, 0x74, 0xd3, 0x5d, 0x97, 0xdd, 0x74, 0xdd, 0x75, 0x1f, 0xa3, 0xaf, 0xd0, 0xd7,
-	0x28, 0x50, 0xcc, 0x8f, 0x28, 0xd2, 0xb2, 0xb3, 0xc8, 0x4e, 0x3c, 0x73, 0xe6, 0xcc, 0xc7, 0xef,
-	0xe7, 0x0c, 0x05, 0xd6, 0x68, 0x1c, 0x92, 0x98, 0x3f, 0x49, 0x52, 0xca, 0x29, 0xaa, 0x8e, 0x29,
-	0x4d, 0xd2, 0x64, 0xd4, 0xfe, 0xf7, 0x39, 0xa5, 0xe7, 0x63, 0xd2, 0xc1, 0x49, 0xd8, 0xc1, 0x71,
-	0x4c, 0x39, 0xe6, 0x21, 0x8d, 0x99, 0xa2, 0xb9, 0xbf, 0x94, 0xc1, 0xde, 0xa7, 0x34, 0x39, 0x9a,
-	0x70, 0x8f, 0xbc, 0x9f, 0x10, 0xc6, 0x91, 0x03, 0x65, 0x1c, 0xf1, 0x96, 0xb1, 0x6e, 0x6c, 0x94,
-	0x3d, 0xf1, 0x13, 0x21, 0xa8, 0x04, 0x84, 0xf1, 0x56, 0x69, 0xdd, 0xd8, 0xa8, 0x79, 0xf2, 0x37,
-	0xea, 0xc0, 0xdd, 0x08, 0x5f, 0xfa, 0xec, 0x23, 0x4e, 0xfc, 0x94, 0x4e, 0x78, 0x18, 0x9f, 0xfb,
-	0x67, 0x84, 0xb4, 0xca, 0x72, 0xdb, 0x52, 0x84, 0x2f, 0x07, 0x1f, 0x71, 0xe2, 0xa9, 0x95, 0x97,
-	0x84, 0xa0, 0x67, 0xb0, 0x22, 0x36, 0x24, 0x29, 0x49, 0xf0, 0x55, 0x61, 0x4b, 0x45, 0x6e, 0x59,
-	0x8e, 0xf0, 0xe5, 0xb1, 0x5c, 0xcc, 0x6d, 0x5a, 0x07, 0x2b, 0x3b, 0x45, 0x50, 0x17, 0x24, 0x15,
-	0xb4, 0xba, 0x60, 0xfc, 0x17, 0xec, 0x9c, 0xac, 0x08, 0x7c, 0x51, 0x72, 0xac, 0x4c, 0x6e, 0x3b,
-	0xe2, 0xc8, 0x85, 0x86, 0x60, 0x45, 0x61, 0x4c, 0x52, 0x29, 0x54, 0x95, 0xa4, 0x7a, 0x84, 0x2f,
-	0x0f, 0x04, 0x26, 0x94, 0x36, 0xc0, 0x11, 0x39, 0xf3, 0xe9, 0x84, 0xfb, 0xa3, 0x0b, 0x1c, 0xc7,
-	0x64, 0xdc, 0x32, 0xd7, 0x8d, 0x8d, 0x8a, 0x67, 0x8f, 0x55, 0x86, 0xba, 0x0a, 0x45, 0x9b, 0xb0,
-	0xc4, 0x3e, 0x12, 0x92, 0xf8, 0x23, 0x1a, 0x9f, 0xf9, 0x1c, 0xa7, 0xe7, 0x84, 0xb7, 0x6a, 0xeb,
-	0xc6, 0xc6, 0x82, 0xd7, 0x94, 0x0b, 0x5d, 0x1a, 0x9f, 0x0d, 0x25, 0x8c, 0x9e, 0xc3, 0x9a, 0x8c,
-	0x3e, 0x99, 0x9c, 0x8e, 0xc3, 0x91, 0xcc, 0xbd, 0x1f, 0x10, 0x1c, 0x8c, 0xc3, 0x98, 0xb4, 0x40,
-	0xca, 0xaf, 0x0a, 0xc2, 0xf1, 0x6c, 0x7d, 0x47, 0x2f, 0xbb, 0xbf, 0x19, 0xd0, 0x10, 0xc5, 0xe9,
-	0xc7, 0xb7, 0xd7, 0xe6, 0x7a, 0x86, 0x4a, 0x73, 0x19, 0x9a, 0x7b, 0xf7, 0xf2, 0xfc, 0xbb, 0xaf,
-	0x81, 0x39, 0xc6, 0x8c, 0xfb, 0x17, 0x34, 0x91, 0xe5, 0xb0, 0xbc, 0xaa, 0x78, 0xde, 0xa5, 0x09,
-	0xfa, 0x0f, 0x34, 0xc8, 0x25, 0x27, 0x69, 0x8c, 0xc7, 0xfe, 0x05, 0x1f, 0x8f, 0x64, 0x0d, 0x4c,
-	0xcf, 0x9a, 0x82, 0xbb, 0x7c, 0x3c, 0x72, 0xdf, 0x81, 0x25, 0xcb, 0x4d, 0x58, 0x42, 0x63, 0x46,
-	0x10, 0x82, 0x52, 0x18, 0xc8, 0x30, 0x6b, 0x2f, 0x4a, 0x2d, 0xc3, 0x2b, 0x85, 0x81, 0x38, 0x23,
-	0x0c, 0xfc, 0xd3, 0x2b, 0x4e, 0x98, 0x0c, 0xc1, 0xf2, 0xaa, 0x61, 0xf0, 0x42, 0x3c, 0xa2, 0x87,
-	0x60, 0x09, 0x69, 0x1f, 0x07, 0x41, 0x4a, 0x18, 0xd3, 0x8d, 0x56, 0x17, 0xd8, 0xb6, 0x82, 0x5c,
-	0x07, 0xec, 0x03, 0x1a, 0x87, 0x9c, 0xa6, 0x3a, 0x17, 0xee, 0xdf, 0x25, 0x00, 0x71, 0xe8, 0x80,
-	0x63, 0x3e, 0x61, 0x37, 0xb6, 0xad, 0x08, 0xa2, 0x74, 0x6b, 0x10, 0xf5, 0x62, 0x10, 0x8f, 0xa0,
-	0xc2, 0xaf, 0x12, 0x95, 0x1e, 0x7b, 0x6b, 0xe9, 0x89, 0x1e, 0xa0, 0x27, 0xe2, 0x8c, 0xe1, 0x55,
-	0x42, 0x3c, 0xb9, 0x8c, 0x36, 0x60, 0x81, 0x71, 0xcc, 0x55, 0xdb, 0xda, 0x5b, 0xa8, 0xc0, 0x13,
-	0xb1, 0x10, 0x4f, 0x11, 0xd0, 0xff, 0xa1, 0x19, 0xc6, 0x21, 0x0f, 0x55, 0xd1, 0x79, 0x18, 0x4d,
-	0xfb, 0xd7, 0x9e, 0xc1, 0xc3, 0x30, 0x52, 0x9d, 0x27, 0xb2, 0x3f, 0x49, 0x02, 0xcc, 0x89, 0x62,
-	0xaa, 0x2e, 0xb6, 0x05, 0x7e, 0x22, 0x61, 0xc9, 0xbc, 0x9e, 0xa8, 0xea, 0x5c, 0xa2, 0xd0, 0x03,
-	0xa8, 0x8f, 0x28, 0xe3, 0x3e, 0x23, 0xe9, 0x07, 0x92, 0xca, 0x0e, 0x2e, 0x7b, 0x20, 0xa0, 0x81,
-	0x44, 0x84, 0x86, 0x24, 0xd0, 0x78, 0x74, 0x81, 0xc3, 0x58, 0x36, 0x6e, 0xd9, 0x93, 0x9b, 0x8e,
-	0x14, 0x24, 0x6a, 0xae, 0x28, 0x67, 0x67, 0x8a, 0x03, 0x6a, 0xa6, 0x24, 0x47, 0x63, 0x2e, 0x02,
-	0x67, 0x3f, 0x64, 0x5c, 0xbc, 0x36, 0x9b, 0xd6, 0xe4, 0x3b, 0x58, 0xca, 0x61, 0xba, 0x19, 0x1e,
-	0xc3, 0x82, 0x68, 0x4f, 0xd6, 0x32, 0xd6, 0xcb, 0x1b, 0xf5, 0xad, 0xe5, 0xb9, 0x8c, 0x4d, 0x98,
-	0xa7, 0x18, 0xee, 0x43, 0x68, 0x0a, 0xb0, 0x1f, 0x9f, 0xd1, 0x69, 0xcb, 0xdb, 0x59, 0x2b, 0x59,
-	0xa2, 0x82, 0xae, 0x0d, 0xd6, 0x90, 0xa4, 0x51, 0x76, 0xe4, 0x67, 0x68, 0xe8, 0x67, 0x7d, 0xdc,
-	0xff, 0xa0, 0x19, 0x85, 0xb1, 0x9a, 0x08, 0x1c, 0xd1, 0x49, 0xcc, 0x75, 0xda, 0x1b, 0x51, 0x18,
-	0x0b, 0xf5, 0x6d, 0x09, 0x4a, 0xde, 0x74, 0x72, 0x34, 0x6f, 0x51, 0xf3, 0xd4, 0xf0, 0x28, 0xde,
-	0x5e, 0xc5, 0x34, 0x9c, 0xd2, 0x5e, 0xc5, 0x2c, 0x39, 0xe5, 0xbd, 0x8a, 0x59, 0x76, 0x2a, 0x7b,
-	0x15, 0xb3, 0xe2, 0x2c, 0xec, 0x55, 0xcc, 0xaa, 0x63, 0xba, 0xbf, 0x1a, 0x60, 0x7d, 0x3f, 0xa1,
-	0x9c, 0xdc, 0x3e, 0xa2, 0xb2, 0x22, 0x33, 0xa3, 0x28, 0x49, 0xa3, 0x80, 0xd1, 0xcc, 0x23, 0xe6,
-	0x46, 0xac, 0x3c, 0x3f, 0x62, 0x5f, 0x36, 0x92, 0xca, 0x97, 0x8d, 0xe4, 0x77, 0x03, 0x1a, 0x3a,
-	0x48, 0x9d, 0xa4, 0x35, 0x30, 0x33, 0xcb, 0x50, 0xa1, 0x56, 0x99, 0xf6, 0x8b, 0xfb, 0x00, 0x39,
-	0x37, 0x55, 0x7e, 0x52, 0x4b, 0x32, 0x2b, 0xfd, 0x17, 0xd4, 0xae, 0x5b, 0x89, 0x19, 0x4d, 0x7d,
-	0x44, 0x3a, 0xa3, 0x08, 0x12, 0x5f, 0x45, 0x24, 0xe6, 0xbe, 0xbc, 0x36, 0x94, 0xa1, 0x34, 0x65,
-	0x70, 0x0a, 0xdf, 0x11, 0x89, 0xba, 0x0f, 0x30, 0x1a, 0xf3, 0x0f, 0x7e, 0x40, 0xc6, 0x1c, 0xcb,
-	0x12, 0x2d, 0x78, 0x35, 0x81, 0xec, 0x08, 0xc0, 0x6d, 0x42, 0x63, 0x48, 0x7f, 0x20, 0x71, 0x56,
-	0xe8, 0x6f, 0xc1, 0x9e, 0x02, 0xfa, 0x25, 0x36, 0x61, 0x91, 0x4b, 0x44, 0x77, 0xd6, 0x6c, 0x16,
-	0xf7, 0x19, 0xe6, 0x92, 0xec, 0x69, 0x86, 0xfb, 0x47, 0x09, 0x6a, 0x19, 0x2a, 0x32, 0x7e, 0x8a,
-	0x19, 0xf1, 0x23, 0x3c, 0xc2, 0x29, 0xa5, 0xb1, 0xee, 0x2f, 0x4b, 0x80, 0x07, 0x1a, 0x13, 0x83,
-	0x32, 0x7d, 0x8f, 0x0b, 0xcc, 0x2e, 0x64, 0x2a, 0x2c, 0xaf, 0xae, 0xb1, 0x5d, 0xcc, 0x2e, 0xd0,
-	0x63, 0x70, 0xa6, 0x94, 0x24, 0x25, 0x61, 0x84, 0xcf, 0x89, 0xf6, 0xb6, 0xa6, 0xc6, 0x8f, 0x35,
-	0x2c, 0x86, 0x5c, 0x75, 0x99, 0x9f, 0xe0, 0x30, 0xf0, 0x23, 0x86, 0xb9, 0xbe, 0xf9, 0x6c, 0x85,
-	0x1f, 0xe3, 0x30, 0x38, 0x60, 0x98, 0xa3, 0xa7, 0x70, 0x2f, 0x77, 0x3d, 0xe6, 0xe8, 0xaa, 0x8d,
-	0x51, 0x9a, 0xdd, 0x8f, 0xd9, 0x96, 0x87, 0x60, 0x09, 0xd7, 0xf0, 0x47, 0x29, 0xc1, 0x9c, 0x04,
-	0xba, 0x91, 0xeb, 0x02, 0xeb, 0x2a, 0x08, 0xb5, 0xa0, 0x4a, 0x2e, 0x93, 0x30, 0x25, 0x81, 0x74,
-	0x0d, 0xd3, 0x9b, 0x3e, 0x8a, 0xcd, 0x8c, 0xd3, 0x14, 0x9f, 0x13, 0x3f, 0xc6, 0x11, 0x91, 0x96,
-	0x51, 0xf3, 0xea, 0x1a, 0x3b, 0xc4, 0x11, 0xd9, 0x7c, 0x04, 0xe6, 0xd4, 0x06, 0x91, 0x05, 0xe6,
-	0xfe, 0xd1, 0xd1, 0xb1, 0x7f, 0x74, 0x32, 0x74, 0xee, 0xa0, 0x3a, 0x54, 0xe5, 0x53, 0xff, 0xd0,
-	0x31, 0x36, 0x19, 0xd4, 0x32, 0x17, 0x44, 0x0d, 0xa8, 0xf5, 0x0f, 0xfb, 0xc3, 0xfe, 0xf6, 0xb0,
-	0xb7, 0xe3, 0xdc, 0x41, 0xf7, 0x60, 0xe9, 0xd8, 0xeb, 0xf5, 0x0f, 0xb6, 0x5f, 0xf5, 0x7c, 0xaf,
-	0xf7, 0xba, 0xb7, 0xbd, 0xdf, 0xdb, 0x71, 0x0c, 0x84, 0xc0, 0xde, 0x1d, 0xee, 0x77, 0xfd, 0xe3,
-	0x93, 0x17, 0xfb, 0xfd, 0xc1, 0x6e, 0x6f, 0xc7, 0x29, 0x09, 0xcd, 0xc1, 0x49, 0xb7, 0xdb, 0x1b,
-	0x0c, 0x9c, 0x32, 0x02, 0x58, 0x7c, 0xb9, 0xdd, 0x17, 0xe4, 0x0a, 0x5a, 0x86, 0x66, 0xff, 0xf0,
-	0xf5, 0x51, 0xbf, 0xdb, 0xf3, 0x07, 0xbd, 0xe1, 0x50, 0x80, 0x0b, 0x5b, 0x3f, 0x55, 0xd5, 0x3d,
-	0xd0, 0x95, 0x9f, 0x3f, 0xc8, 0x83, 0xaa, 0xfe, 0xa0, 0x41, 0xab, 0xb3, 0x7e, 0x28, 0x7c, 0xe2,
-	0xb4, 0xef, 0x15, 0x2c, 0x68, 0xda, 0x4f, 0xee, 0xea, 0x8f, 0x7f, 0xfe, 0xf5, 0x73, 0x69, 0xc9,
-	0xb5, 0x3a, 0x1f, 0x9e, 0x76, 0x04, 0xa3, 0x43, 0x27, 0xfc, 0xb9, 0xb1, 0x89, 0x8e, 0x60, 0x51,
-	0xdd, 0xc3, 0x68, 0xa5, 0x20, 0x99, 0x5d, 0xcc, 0xb7, 0x29, 0xae, 0x48, 0x45, 0xc7, 0xad, 0x67,
-	0x8a, 0x61, 0x2c, 0x04, 0x07, 0x50, 0xd5, 0xb7, 0x59, 0x2e, 0xc8, 0xe2, 0xfd, 0xd6, 0xbe, 0xc9,
-	0x27, 0xdd, 0x96, 0x14, 0x44, 0xc8, 0xc9, 0x04, 0x23, 0xb5, 0xeb, 0x1b, 0x03, 0xbd, 0x85, 0x5a,
-	0x66, 0xbe, 0x68, 0x6d, 0x16, 0xe8, 0x35, 0x93, 0x6e, 0xb7, 0x6f, 0x5a, 0x2a, 0x06, 0x8c, 0xec,
-	0x4c, 0x5f, 0x1a, 0x33, 0x3a, 0x51, 0x0d, 0x20, 0x8c, 0x19, 0xb5, 0x0a, 0x81, 0xe5, 0xbc, 0xfa,
-	0xe6, 0x90, 0xdb, 0x52, 0xf2, 0x2e, 0x42, 0x05, 0xc9, 0xce, 0xa7, 0x30, 0xf8, 0x8c, 0xde, 0x80,
-	0xa5, 0x4b, 0x23, 0x3d, 0x1c, 0xcd, 0xd2, 0x98, 0xf7, 0xf8, 0xf6, 0xca, 0x75, 0x58, 0x47, 0x3b,
-	0x2f, 0x4d, 0x27, 0xbc, 0xc3, 0xa5, 0x94, 0x9f, 0x49, 0x4b, 0xe7, 0xcb, 0x49, 0xe7, 0xed, 0x3a,
-	0x27, 0x5d, 0x30, 0x48, 0x77, 0x5d, 0x4a, 0xb7, 0x51, 0xab, 0x20, 0xfd, 0x5e, 0x70, 0x3a, 0x9f,
-	0x70, 0xc4, 0x3f, 0xa3, 0xb7, 0x60, 0xbf, 0x22, 0x5c, 0xb5, 0xc1, 0x57, 0x45, 0xbf, 0x26, 0x8f,
-	0x58, 0x46, 0x4b, 0xb9, 0xe6, 0xd0, 0xc1, 0xbf, 0xcb, 0x69, 0x7f, 0x55, 0xf8, 0x0f, 0xa4, 0xf6,
-	0x1a, 0x5a, 0xcd, 0x6b, 0xe7, 0xa3, 0x7f, 0x03, 0x0d, 0x71, 0xc2, 0xd4, 0x11, 0x59, 0xae, 0xb3,
-	0x0b, 0xb6, 0xdb, 0x5e, 0x9d, 0xc3, 0x8b, 0xd3, 0x82, 0x9a, 0xf2, 0x08, 0x86, 0x79, 0x47, 0x59,
-	0xed, 0xe9, 0xa2, 0xfc, 0x6b, 0xf1, 0xec, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, 0x22, 0xfe,
-	0xe9, 0x91, 0x0c, 0x00, 0x00,
+	// 1435 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcb, 0x6e, 0xdb, 0x46,
+	0x14, 0x0d, 0x25, 0xd9, 0x92, 0xae, 0x28, 0x8a, 0x1e, 0x27, 0xb6, 0xac, 0x36, 0x88, 0xc3, 0x36,
+	0xad, 0xe3, 0x45, 0xd4, 0x38, 0xab, 0x06, 0x45, 0x01, 0x47, 0x56, 0x62, 0x19, 0x7e, 0x95, 0x92,
+	0x03, 0x24, 0x1b, 0x66, 0x2c, 0x8e, 0x2d, 0xa2, 0x22, 0x87, 0xe1, 0x8c, 0x12, 0x1b, 0x41, 0x36,
+	0xfd, 0x85, 0xee, 0xba, 0xec, 0xa6, 0xeb, 0xae, 0xfb, 0x19, 0xfd, 0x85, 0x7e, 0x42, 0xb7, 0x05,
+	0x8a, 0x79, 0x88, 0x22, 0x2d, 0x3b, 0x8b, 0xec, 0xc4, 0x33, 0x67, 0xce, 0x5c, 0xde, 0xc7, 0x19,
+	0x0a, 0xcc, 0xe1, 0x38, 0x20, 0x11, 0x7f, 0x14, 0x27, 0x94, 0x53, 0x54, 0x1e, 0x53, 0x1a, 0x27,
+	0xf1, 0xb0, 0xf5, 0xe5, 0x39, 0xa5, 0xe7, 0x63, 0xd2, 0xc6, 0x71, 0xd0, 0xc6, 0x51, 0x44, 0x39,
+	0xe6, 0x01, 0x8d, 0x98, 0xa2, 0x39, 0xbf, 0x15, 0xc1, 0xda, 0xa7, 0x34, 0x3e, 0x9a, 0x70, 0x97,
+	0xbc, 0x9d, 0x10, 0xc6, 0x91, 0x0d, 0x45, 0x1c, 0xf2, 0xa6, 0xb1, 0x6e, 0x6c, 0x14, 0x5d, 0xf1,
+	0x13, 0x21, 0x28, 0xf9, 0x84, 0xf1, 0x66, 0x61, 0xdd, 0xd8, 0xa8, 0xba, 0xf2, 0x37, 0x6a, 0xc3,
+	0xed, 0x10, 0x5f, 0x78, 0xec, 0x3d, 0x8e, 0xbd, 0x84, 0x4e, 0x78, 0x10, 0x9d, 0x7b, 0x67, 0x84,
+	0x34, 0x8b, 0x72, 0xdb, 0x52, 0x88, 0x2f, 0xfa, 0xef, 0x71, 0xec, 0xaa, 0x95, 0xe7, 0x84, 0xa0,
+	0x27, 0xb0, 0x22, 0x36, 0xc4, 0x09, 0x89, 0xf1, 0x65, 0x6e, 0x4b, 0x49, 0x6e, 0x59, 0x0e, 0xf1,
+	0xc5, 0xb1, 0x5c, 0xcc, 0x6c, 0x5a, 0x07, 0x33, 0x3d, 0x45, 0x50, 0x17, 0x24, 0x15, 0xb4, 0xba,
+	0x60, 0x7c, 0x0d, 0x56, 0x46, 0x56, 0x04, 0xbe, 0x28, 0x39, 0x66, 0x2a, 0xb7, 0x1d, 0x72, 0xe4,
+	0x40, 0x5d, 0xb0, 0xc2, 0x20, 0x22, 0x89, 0x14, 0x2a, 0x4b, 0x52, 0x2d, 0xc4, 0x17, 0x07, 0x02,
+	0x13, 0x4a, 0x1b, 0x60, 0x8b, 0x9c, 0x79, 0x74, 0xc2, 0xbd, 0xe1, 0x08, 0x47, 0x11, 0x19, 0x37,
+	0x2b, 0xeb, 0xc6, 0x46, 0xc9, 0xb5, 0xc6, 0x2a, 0x43, 0x1d, 0x85, 0xa2, 0x4d, 0x58, 0x62, 0xef,
+	0x09, 0x89, 0xbd, 0x21, 0x8d, 0xce, 0x3c, 0x8e, 0x93, 0x73, 0xc2, 0x9b, 0xd5, 0x75, 0x63, 0x63,
+	0xc1, 0x6d, 0xc8, 0x85, 0x0e, 0x8d, 0xce, 0x06, 0x12, 0x46, 0x4f, 0x61, 0x4d, 0x46, 0x1f, 0x4f,
+	0x4e, 0xc7, 0xc1, 0x50, 0xe6, 0xde, 0xf3, 0x09, 0xf6, 0xc7, 0x41, 0x44, 0x9a, 0x20, 0xe5, 0x57,
+	0x05, 0xe1, 0x78, 0xb6, 0xbe, 0xa3, 0x97, 0x9d, 0x3f, 0x0c, 0xa8, 0x8b, 0xe2, 0xf4, 0xa2, 0x9b,
+	0x6b, 0x73, 0x35, 0x43, 0x85, 0xb9, 0x0c, 0xcd, 0xbd, 0x7b, 0x71, 0xfe, 0xdd, 0xd7, 0xa0, 0x32,
+	0xc6, 0x8c, 0x7b, 0x23, 0x1a, 0xcb, 0x72, 0x98, 0x6e, 0x59, 0x3c, 0xef, 0xd2, 0x18, 0x7d, 0x05,
+	0x75, 0x72, 0xc1, 0x49, 0x12, 0xe1, 0xb1, 0x37, 0xe2, 0xe3, 0xa1, 0xac, 0x41, 0xc5, 0x35, 0xa7,
+	0xe0, 0x2e, 0x1f, 0x0f, 0x9d, 0x37, 0x60, 0xca, 0x72, 0x13, 0x16, 0xd3, 0x88, 0x11, 0x84, 0xa0,
+	0x10, 0xf8, 0x32, 0xcc, 0xea, 0xb3, 0x42, 0xd3, 0x70, 0x0b, 0x81, 0x2f, 0xce, 0x08, 0x7c, 0xef,
+	0xf4, 0x92, 0x13, 0x26, 0x43, 0x30, 0xdd, 0x72, 0xe0, 0x3f, 0x13, 0x8f, 0xe8, 0x3e, 0x98, 0x42,
+	0xda, 0xc3, 0xbe, 0x9f, 0x10, 0xc6, 0x74, 0xa3, 0xd5, 0x04, 0xb6, 0xad, 0x20, 0xc7, 0x06, 0xeb,
+	0x80, 0x46, 0x01, 0xa7, 0x89, 0xce, 0x85, 0xf3, 0x5f, 0x01, 0x40, 0x1c, 0xda, 0xe7, 0x98, 0x4f,
+	0xd8, 0xb5, 0x6d, 0x2b, 0x82, 0x28, 0xdc, 0x18, 0x44, 0x2d, 0x1f, 0xc4, 0x03, 0x28, 0xf1, 0xcb,
+	0x58, 0xa5, 0xc7, 0xda, 0x5a, 0x7a, 0xa4, 0x07, 0xe8, 0x91, 0x38, 0x63, 0x70, 0x19, 0x13, 0x57,
+	0x2e, 0xa3, 0x0d, 0x58, 0x60, 0x1c, 0x73, 0xd5, 0xb6, 0xd6, 0x16, 0xca, 0xf1, 0x44, 0x2c, 0xc4,
+	0x55, 0x04, 0xf4, 0x2d, 0x34, 0x82, 0x28, 0xe0, 0x81, 0x2a, 0x3a, 0x0f, 0xc2, 0x69, 0xff, 0x5a,
+	0x33, 0x78, 0x10, 0x84, 0xaa, 0xf3, 0x44, 0xf6, 0x27, 0xb1, 0x8f, 0x39, 0x51, 0x4c, 0xd5, 0xc5,
+	0x96, 0xc0, 0x4f, 0x24, 0x2c, 0x99, 0x57, 0x13, 0x55, 0x9e, 0x4b, 0x14, 0xba, 0x07, 0xb5, 0x21,
+	0x65, 0xdc, 0x63, 0x24, 0x79, 0x47, 0x12, 0xd9, 0xc1, 0x45, 0x17, 0x04, 0xd4, 0x97, 0x88, 0xd0,
+	0x90, 0x04, 0x1a, 0x0d, 0x47, 0x38, 0x88, 0x64, 0xe3, 0x16, 0x5d, 0xb9, 0xe9, 0x48, 0x41, 0xa2,
+	0xe6, 0x8a, 0x72, 0x76, 0xa6, 0x38, 0xa0, 0x66, 0x4a, 0x72, 0x34, 0xe6, 0x20, 0xb0, 0xf7, 0x03,
+	0xc6, 0xc5, 0x6b, 0xb3, 0x69, 0x4d, 0x7e, 0x84, 0xa5, 0x0c, 0xa6, 0x9b, 0xe1, 0x21, 0x2c, 0x88,
+	0xf6, 0x64, 0x4d, 0x63, 0xbd, 0xb8, 0x51, 0xdb, 0x5a, 0x9e, 0xcb, 0xd8, 0x84, 0xb9, 0x8a, 0xe1,
+	0xdc, 0x87, 0x86, 0x00, 0x7b, 0xd1, 0x19, 0x9d, 0xb6, 0xbc, 0x95, 0xb6, 0x92, 0x29, 0x2a, 0xe8,
+	0x58, 0x60, 0x0e, 0x48, 0x12, 0xa6, 0x47, 0x7e, 0x84, 0xba, 0x7e, 0xd6, 0xc7, 0x7d, 0x03, 0x8d,
+	0x30, 0x88, 0xd4, 0x44, 0xe0, 0x90, 0x4e, 0x22, 0xae, 0xd3, 0x5e, 0x0f, 0x83, 0x48, 0xa8, 0x6f,
+	0x4b, 0x50, 0xf2, 0xa6, 0x93, 0xa3, 0x79, 0x8b, 0x9a, 0xa7, 0x86, 0x47, 0xf1, 0xf6, 0x4a, 0x15,
+	0xc3, 0x2e, 0xec, 0x95, 0x2a, 0x05, 0xbb, 0xb8, 0x57, 0xaa, 0x14, 0xed, 0xd2, 0x5e, 0xa9, 0x52,
+	0xb2, 0x17, 0xf6, 0x4a, 0x95, 0xb2, 0x5d, 0x71, 0x7e, 0x37, 0xc0, 0xfc, 0x69, 0x42, 0x39, 0xb9,
+	0x79, 0x44, 0x65, 0x45, 0x66, 0x46, 0x51, 0x90, 0x46, 0x01, 0xc3, 0x99, 0x47, 0xcc, 0x8d, 0x58,
+	0x71, 0x7e, 0xc4, 0x3e, 0x6d, 0x24, 0xa5, 0x4f, 0x1b, 0xc9, 0x9f, 0x06, 0xd4, 0x75, 0x90, 0x3a,
+	0x49, 0x6b, 0x50, 0x49, 0x2d, 0x43, 0x85, 0x5a, 0x66, 0xda, 0x2f, 0xee, 0x02, 0x64, 0xdc, 0x54,
+	0xf9, 0x49, 0x35, 0x4e, 0xad, 0xf4, 0x0b, 0xa8, 0x5e, 0xb5, 0x92, 0x4a, 0x38, 0xf5, 0x11, 0xe9,
+	0x8c, 0x22, 0x48, 0x7c, 0x19, 0x92, 0x88, 0x7b, 0xf2, 0xda, 0x50, 0x86, 0xd2, 0x90, 0xc1, 0x29,
+	0x7c, 0x47, 0x24, 0xea, 0x2e, 0xc0, 0x70, 0xcc, 0xdf, 0x79, 0x3e, 0x19, 0x73, 0x2c, 0x4b, 0xb4,
+	0xe0, 0x56, 0x05, 0xb2, 0x23, 0x00, 0xa7, 0x01, 0xf5, 0x01, 0xfd, 0x99, 0x44, 0x69, 0xa1, 0x7f,
+	0x00, 0x6b, 0x0a, 0xe8, 0x97, 0xd8, 0x84, 0x45, 0x2e, 0x11, 0xdd, 0x59, 0xb3, 0x59, 0xdc, 0x67,
+	0x98, 0x4b, 0xb2, 0xab, 0x19, 0xce, 0x5f, 0x05, 0xa8, 0xa6, 0xa8, 0xc8, 0xf8, 0x29, 0x66, 0xc4,
+	0x0b, 0xf1, 0x10, 0x27, 0x94, 0x46, 0xba, 0xbf, 0x4c, 0x01, 0x1e, 0x68, 0x4c, 0x0c, 0xca, 0xf4,
+	0x3d, 0x46, 0x98, 0x8d, 0x64, 0x2a, 0x4c, 0xb7, 0xa6, 0xb1, 0x5d, 0xcc, 0x46, 0xe8, 0x21, 0xd8,
+	0x53, 0x4a, 0x9c, 0x90, 0x20, 0xc4, 0xe7, 0x44, 0x7b, 0x5b, 0x43, 0xe3, 0xc7, 0x1a, 0x16, 0x43,
+	0xae, 0xba, 0xcc, 0x8b, 0x71, 0xe0, 0x7b, 0x21, 0xc3, 0x5c, 0xdf, 0x7c, 0x96, 0xc2, 0x8f, 0x71,
+	0xe0, 0x1f, 0x30, 0xcc, 0xd1, 0x63, 0xb8, 0x93, 0xb9, 0x1e, 0x33, 0x74, 0xd5, 0xc6, 0x28, 0x49,
+	0xef, 0xc7, 0x74, 0xcb, 0x7d, 0x30, 0x85, 0x6b, 0x78, 0xc3, 0x84, 0x60, 0x4e, 0x7c, 0xdd, 0xc8,
+	0x35, 0x81, 0x75, 0x14, 0x84, 0x9a, 0x50, 0x26, 0x17, 0x71, 0x90, 0x10, 0x5f, 0xba, 0x46, 0xc5,
+	0x9d, 0x3e, 0x8a, 0xcd, 0x8c, 0xd3, 0x04, 0x9f, 0x13, 0x2f, 0xc2, 0x21, 0x91, 0x96, 0x51, 0x75,
+	0x6b, 0x1a, 0x3b, 0xc4, 0x21, 0xd9, 0x7c, 0x00, 0x95, 0xa9, 0x0d, 0x22, 0x13, 0x2a, 0xfb, 0x47,
+	0x47, 0xc7, 0xde, 0xd1, 0xc9, 0xc0, 0xbe, 0x85, 0x6a, 0x50, 0x96, 0x4f, 0xbd, 0x43, 0xdb, 0xd8,
+	0x64, 0x50, 0x4d, 0x5d, 0x10, 0xd5, 0xa1, 0xda, 0x3b, 0xec, 0x0d, 0x7a, 0xdb, 0x83, 0xee, 0x8e,
+	0x7d, 0x0b, 0xdd, 0x81, 0xa5, 0x63, 0xb7, 0xdb, 0x3b, 0xd8, 0x7e, 0xd1, 0xf5, 0xdc, 0xee, 0xcb,
+	0xee, 0xf6, 0x7e, 0x77, 0xc7, 0x36, 0x10, 0x02, 0x6b, 0x77, 0xb0, 0xdf, 0xf1, 0x8e, 0x4f, 0x9e,
+	0xed, 0xf7, 0xfa, 0xbb, 0xdd, 0x1d, 0xbb, 0x20, 0x34, 0xfb, 0x27, 0x9d, 0x4e, 0xb7, 0xdf, 0xb7,
+	0x8b, 0x08, 0x60, 0xf1, 0xf9, 0x76, 0x4f, 0x90, 0x4b, 0x68, 0x19, 0x1a, 0xbd, 0xc3, 0x97, 0x47,
+	0xbd, 0x4e, 0xd7, 0xeb, 0x77, 0x07, 0x03, 0x01, 0x2e, 0x6c, 0xfd, 0xbb, 0xa8, 0xee, 0x81, 0x8e,
+	0xfc, 0xfc, 0x41, 0x2e, 0x94, 0xf5, 0x07, 0x0d, 0x5a, 0x9d, 0xf5, 0x43, 0xee, 0x13, 0xa7, 0x75,
+	0x27, 0x67, 0x41, 0xd3, 0x7e, 0x72, 0x56, 0x7f, 0xf9, 0xfb, 0x9f, 0x5f, 0x0b, 0x4b, 0x8e, 0xd9,
+	0x7e, 0xf7, 0xb8, 0x2d, 0x18, 0x6d, 0x3a, 0xe1, 0x4f, 0x8d, 0x4d, 0x74, 0x04, 0x8b, 0xea, 0x1e,
+	0x46, 0x2b, 0x39, 0xc9, 0xf4, 0x62, 0xbe, 0x49, 0x71, 0x45, 0x2a, 0xda, 0x4e, 0x2d, 0x55, 0x0c,
+	0x22, 0x21, 0xf8, 0x3d, 0x94, 0xf5, 0x6d, 0x96, 0x09, 0x32, 0x7f, 0xbf, 0xb5, 0xae, 0xf3, 0xc9,
+	0xef, 0x0c, 0xf4, 0x1a, 0xaa, 0xa9, 0xc5, 0xa2, 0xb5, 0x59, 0x38, 0x57, 0xac, 0xb8, 0xd5, 0xba,
+	0x6e, 0x29, 0x1f, 0x16, 0xb2, 0xd2, 0xb0, 0xa4, 0xfd, 0xa2, 0x13, 0x55, 0x66, 0x61, 0xbf, 0xa8,
+	0x99, 0x3b, 0x3e, 0xe3, 0xc8, 0xd7, 0x06, 0xe6, 0xb4, 0xa4, 0xe4, 0x6d, 0x84, 0x72, 0x92, 0xed,
+	0x0f, 0x81, 0xff, 0x11, 0xbd, 0x02, 0x53, 0x17, 0x40, 0x3a, 0x35, 0x9a, 0x25, 0x2b, 0xeb, 0xe4,
+	0xad, 0x95, 0xab, 0xb0, 0x8e, 0x76, 0x5e, 0x9a, 0x4e, 0x78, 0x9b, 0x4b, 0x29, 0x2f, 0x95, 0x96,
+	0xfe, 0x96, 0x91, 0xce, 0x9a, 0x72, 0x46, 0x3a, 0x67, 0x83, 0xce, 0xba, 0x94, 0x6e, 0xa1, 0x66,
+	0x4e, 0xfa, 0xad, 0xe0, 0xb4, 0x3f, 0xe0, 0x90, 0x7f, 0x44, 0xaf, 0xc1, 0x7a, 0x41, 0xb8, 0x2a,
+	0xf6, 0x67, 0x45, 0xbf, 0x26, 0x8f, 0x58, 0x46, 0x4b, 0x99, 0x16, 0xd0, 0xc1, 0xbf, 0xc9, 0x68,
+	0x7f, 0x56, 0xf8, 0xf7, 0xa4, 0xf6, 0x1a, 0x5a, 0xcd, 0x6a, 0x67, 0xa3, 0x7f, 0x05, 0x75, 0x71,
+	0xc2, 0xd4, 0xf7, 0x58, 0xa6, 0x7f, 0x73, 0xe6, 0xda, 0x5a, 0x9d, 0xc3, 0xf3, 0x33, 0x81, 0x1a,
+	0xf2, 0x08, 0x86, 0x79, 0x5b, 0x19, 0xea, 0xe9, 0xa2, 0xfc, 0x03, 0xf1, 0xe4, 0xff, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x47, 0xdd, 0x3b, 0x05, 0x77, 0x0c, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/looprpc/client.pb.gw.go b/looprpc/client.pb.gw.go
index 05bd907..e45c4c5 100644
--- a/looprpc/client.pb.gw.go
+++ b/looprpc/client.pb.gw.go
@@ -62,23 +62,6 @@ func request_SwapClient_LoopIn_0(ctx context.Context, marshaler runtime.Marshale
 
 }
 
-func request_SwapClient_Monitor_0(ctx context.Context, marshaler runtime.Marshaler, client SwapClientClient, req *http.Request, pathParams map[string]string) (SwapClient_MonitorClient, runtime.ServerMetadata, error) {
-	var protoReq MonitorRequest
-	var metadata runtime.ServerMetadata
-
-	stream, err := client.Monitor(ctx, &protoReq)
-	if err != nil {
-		return nil, metadata, err
-	}
-	header, err := stream.Header()
-	if err != nil {
-		return nil, metadata, err
-	}
-	metadata.HeaderMD = header
-	return stream, metadata, nil
-
-}
-
 func request_SwapClient_ListSwaps_0(ctx context.Context, marshaler runtime.Marshaler, client SwapClientClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ListSwapsRequest
 	var metadata runtime.ServerMetadata
@@ -290,26 +273,6 @@ func RegisterSwapClientHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 
 	})
 
-	mux.Handle("GET", pattern_SwapClient_Monitor_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_SwapClient_Monitor_0(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_SwapClient_Monitor_0(ctx, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("GET", pattern_SwapClient_ListSwaps_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -458,8 +421,6 @@ var (
 
 	pattern_SwapClient_LoopIn_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "loop", "in"}, ""))
 
-	pattern_SwapClient_Monitor_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "loop", "monitor"}, ""))
-
 	pattern_SwapClient_ListSwaps_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "loop", "swaps"}, ""))
 
 	pattern_SwapClient_SwapInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "loop", "swap", "id"}, ""))
@@ -480,8 +441,6 @@ var (
 
 	forward_SwapClient_LoopIn_0 = runtime.ForwardResponseMessage
 
-	forward_SwapClient_Monitor_0 = runtime.ForwardResponseStream
-
 	forward_SwapClient_ListSwaps_0 = runtime.ForwardResponseMessage
 
 	forward_SwapClient_SwapInfo_0 = runtime.ForwardResponseMessage
diff --git a/looprpc/client.proto b/looprpc/client.proto
index 71ff8ee..a246eb5 100644
--- a/looprpc/client.proto
+++ b/looprpc/client.proto
@@ -38,11 +38,7 @@ service SwapClient {
     /** loop: `monitor`
     Monitor will return a stream of swap updates for currently active swaps.
     */
-    rpc Monitor (MonitorRequest) returns (stream SwapStatus) {
-        option (google.api.http) = {
-            get: "/v1/loop/monitor"
-        };
-    }
+    rpc Monitor (MonitorRequest) returns (stream SwapStatus);
 
     /** loop: `listswaps`
     ListSwaps returns a list of all currently known swaps and their current
@@ -368,7 +364,7 @@ message ListSwapsResponse {
 message SwapInfoRequest {
     /**
     The swap identifier which currently is the hash that locks the HTLCs. When
-    using REST, this field must be encoded as base64.
+    using REST, this field must be encoded as URL safe base64.
     */
     bytes id = 1;
 }
diff --git a/looprpc/client.swagger.json b/looprpc/client.swagger.json
index 54457f9..faa12b6 100644
--- a/looprpc/client.swagger.json
+++ b/looprpc/client.swagger.json
@@ -110,23 +110,6 @@
         ]
       }
     },
-    "/v1/loop/monitor": {
-      "get": {
-        "summary": "* loop: `monitor`\nMonitor will return a stream of swap updates for currently active swaps.",
-        "operationId": "Monitor",
-        "responses": {
-          "200": {
-            "description": "A successful response.(streaming responses)",
-            "schema": {
-              "$ref": "#/x-stream-definitions/looprpcSwapStatus"
-            }
-          }
-        },
-        "tags": [
-          "SwapClient"
-        ]
-      }
-    },
     "/v1/loop/out": {
       "post": {
         "summary": "* loop: `out`\nLoopOut initiates an loop out swap with the given parameters. The call\nreturns after the swap has been set up with the swap server. From that\npoint onwards, progress can be tracked via the SwapStatus stream that is\nreturned from Monitor().",
@@ -237,7 +220,7 @@
         "parameters": [
           {
             "name": "id",
-            "description": "*\nThe swap identifier which currently is the hash that locks the HTLCs. When\nusing REST, this field must be encoded as base64.",
+            "description": "*\nThe swap identifier which currently is the hash that locks the HTLCs. When\nusing REST, this field must be encoded as URL safe base64.",
             "in": "path",
             "required": true,
             "type": "string",