looprpc+loopd: deprecate string ID

pull/140/head
Oliver Gugger 4 years ago
parent 26c0c17dbd
commit b694a76be0
No known key found for this signature in database
GPG Key ID: 8E4256593F177720

@ -99,6 +99,7 @@ func (s *swapClientServer) LoopOut(ctx context.Context,
return &looprpc.SwapResponse{ return &looprpc.SwapResponse{
Id: hash.String(), Id: hash.String(),
IdBytes: hash[:],
HtlcAddress: htlc.String(), HtlcAddress: htlc.String(),
}, nil }, nil
} }
@ -136,6 +137,7 @@ func (s *swapClientServer) marshallSwap(loopSwap *loop.SwapInfo) (
return &looprpc.SwapStatus{ return &looprpc.SwapStatus{
Amt: int64(loopSwap.AmountRequested), Amt: int64(loopSwap.AmountRequested),
Id: loopSwap.SwapHash.String(), Id: loopSwap.SwapHash.String(),
IdBytes: loopSwap.SwapHash[:],
State: state, State: state,
InitiationTime: loopSwap.InitiationTime.UnixNano(), InitiationTime: loopSwap.InitiationTime.UnixNano(),
LastUpdateTime: loopSwap.LastUpdate.UnixNano(), LastUpdateTime: loopSwap.LastUpdate.UnixNano(),
@ -396,6 +398,7 @@ func (s *swapClientServer) LoopIn(ctx context.Context,
return &looprpc.SwapResponse{ return &looprpc.SwapResponse{
Id: hash.String(), Id: hash.String(),
IdBytes: hash[:],
HtlcAddress: htlc.String(), HtlcAddress: htlc.String(),
}, nil }, nil
} }

@ -363,7 +363,13 @@ type SwapResponse struct {
//* //*
//Swap identifier to track status in the update stream that is returned from //Swap identifier to track status in the update stream that is returned from
//the Start() call. Currently this is the hash that locks the htlcs. //the Start() call. Currently this is the hash that locks the htlcs.
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` //DEPRECATED: To make the API more consistent, this field is deprecated in
//favor of id_bytes and will be removed in a future release.
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Deprecated: Do not use.
//*
//Swap identifier to track status in the update stream that is returned from
//the Start() call. Currently this is the hash that locks the htlcs.
IdBytes []byte `protobuf:"bytes,3,opt,name=id_bytes,json=idBytes,proto3" json:"id_bytes,omitempty"`
//* //*
//The address of the on-chain htlc. //The address of the on-chain htlc.
HtlcAddress string `protobuf:"bytes,2,opt,name=htlc_address,json=htlcAddress,proto3" json:"htlc_address,omitempty"` HtlcAddress string `protobuf:"bytes,2,opt,name=htlc_address,json=htlcAddress,proto3" json:"htlc_address,omitempty"`
@ -397,6 +403,7 @@ func (m *SwapResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_SwapResponse proto.InternalMessageInfo var xxx_messageInfo_SwapResponse proto.InternalMessageInfo
// Deprecated: Do not use.
func (m *SwapResponse) GetId() string { func (m *SwapResponse) GetId() string {
if m != nil { if m != nil {
return m.Id return m.Id
@ -404,6 +411,13 @@ func (m *SwapResponse) GetId() string {
return "" return ""
} }
func (m *SwapResponse) GetIdBytes() []byte {
if m != nil {
return m.IdBytes
}
return nil
}
func (m *SwapResponse) GetHtlcAddress() string { func (m *SwapResponse) GetHtlcAddress() string {
if m != nil { if m != nil {
return m.HtlcAddress return m.HtlcAddress
@ -450,7 +464,13 @@ type SwapStatus struct {
//* //*
//Swap identifier to track status in the update stream that is returned from //Swap identifier to track status in the update stream that is returned from
//the Start() call. Currently this is the hash that locks the htlcs. //the Start() call. Currently this is the hash that locks the htlcs.
Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` //DEPRECATED: To make the API more consistent, this field is deprecated in
//favor of id_bytes and will be removed in a future release.
Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` // Deprecated: Do not use.
//*
//Swap identifier to track status in the update stream that is returned from
//the Start() call. Currently this is the hash that locks the htlcs.
IdBytes []byte `protobuf:"bytes,11,opt,name=id_bytes,json=idBytes,proto3" json:"id_bytes,omitempty"`
//* //*
//Swap type //Swap type
Type SwapType `protobuf:"varint,3,opt,name=type,proto3,enum=looprpc.SwapType" json:"type,omitempty"` Type SwapType `protobuf:"varint,3,opt,name=type,proto3,enum=looprpc.SwapType" json:"type,omitempty"`
@ -509,6 +529,7 @@ func (m *SwapStatus) GetAmt() int64 {
return 0 return 0
} }
// Deprecated: Do not use.
func (m *SwapStatus) GetId() string { func (m *SwapStatus) GetId() string {
if m != nil { if m != nil {
return m.Id return m.Id
@ -516,6 +537,13 @@ func (m *SwapStatus) GetId() string {
return "" return ""
} }
func (m *SwapStatus) GetIdBytes() []byte {
if m != nil {
return m.IdBytes
}
return nil
}
func (m *SwapStatus) GetType() SwapType { func (m *SwapStatus) GetType() SwapType {
if m != nil { if m != nil {
return m.Type return m.Type
@ -1138,96 +1166,98 @@ func init() {
func init() { proto.RegisterFile("client.proto", fileDescriptor_014de31d7ac8c57c) } func init() { proto.RegisterFile("client.proto", fileDescriptor_014de31d7ac8c57c) }
var fileDescriptor_014de31d7ac8c57c = []byte{ var fileDescriptor_014de31d7ac8c57c = []byte{
// 1421 bytes of a gzipped FileDescriptorProto // 1446 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcd, 0x6e, 0xdb, 0xc6, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4d, 0x6e, 0xdb, 0x46,
0x16, 0x8e, 0x24, 0xda, 0x92, 0x8e, 0x28, 0x8a, 0x1e, 0x27, 0xb6, 0xac, 0x7b, 0x83, 0x38, 0xbc, 0x18, 0x0d, 0x25, 0xda, 0x92, 0x3e, 0x51, 0x14, 0x3d, 0x4e, 0x6c, 0x59, 0x6d, 0x10, 0x87, 0x6d,
0x37, 0xa9, 0xe3, 0x45, 0xd4, 0x38, 0xbb, 0xa0, 0x28, 0xa0, 0xca, 0x4a, 0x2c, 0xc3, 0x7f, 0xa5, 0x52, 0xc7, 0x8b, 0xa8, 0x71, 0x76, 0x41, 0x51, 0xc0, 0x91, 0x95, 0x58, 0x86, 0x7f, 0x54, 0x4a,
0xe4, 0x00, 0xc9, 0x86, 0x9d, 0x48, 0x63, 0x9b, 0xa8, 0xf8, 0x13, 0xce, 0x28, 0xb1, 0x11, 0x64, 0x0e, 0x90, 0x6c, 0x98, 0xb1, 0x38, 0xb6, 0x89, 0x8a, 0x1c, 0x86, 0x33, 0x4a, 0x6c, 0x04, 0xd9,
0xd3, 0x07, 0xe8, 0xa6, 0xbb, 0x2e, 0xfb, 0x06, 0x05, 0xba, 0xeb, 0x63, 0x74, 0xdf, 0x55, 0x1f, 0xf4, 0x00, 0xdd, 0x74, 0xd7, 0x65, 0x6f, 0x50, 0xa0, 0xbb, 0x1e, 0xa3, 0x57, 0xe8, 0x35, 0x0a,
0xa4, 0x98, 0x33, 0x43, 0x8a, 0xb2, 0x9c, 0x2c, 0xb2, 0xb3, 0xbe, 0xf9, 0xe6, 0x9b, 0x33, 0xe7, 0x14, 0xf3, 0x23, 0x8a, 0xb2, 0xec, 0x2c, 0xb2, 0x33, 0xdf, 0xbc, 0x79, 0xf3, 0xcd, 0x37, 0x6f,
0xe7, 0x1b, 0x1a, 0xcc, 0xd1, 0xc4, 0x67, 0xa1, 0x78, 0x1c, 0x27, 0x91, 0x88, 0x48, 0x79, 0x12, 0xde, 0xc8, 0x60, 0x0d, 0x47, 0x21, 0x89, 0xf9, 0xe3, 0x24, 0xa5, 0x9c, 0xa2, 0xd2, 0x88, 0xd2,
0x45, 0x71, 0x12, 0x8f, 0x5a, 0xff, 0x3d, 0x8f, 0xa2, 0xf3, 0x09, 0x6b, 0xd3, 0xd8, 0x6f, 0xd3, 0x24, 0x4d, 0x86, 0xcd, 0xaf, 0xcf, 0x28, 0x3d, 0x1b, 0x91, 0x16, 0x4e, 0xc2, 0x16, 0x8e, 0x63,
0x30, 0x8c, 0x04, 0x15, 0x7e, 0x14, 0x72, 0x45, 0x73, 0x7e, 0x2d, 0x81, 0x75, 0x10, 0x45, 0xf1, 0xca, 0x31, 0x0f, 0x69, 0xcc, 0x14, 0xcd, 0xfd, 0xbd, 0x08, 0xf6, 0x3e, 0xa5, 0xc9, 0xd1, 0x98,
0xf1, 0x54, 0xb8, 0xec, 0xed, 0x94, 0x71, 0x41, 0x6c, 0x28, 0xd1, 0x40, 0x34, 0x0b, 0x9b, 0x85, 0x7b, 0xe4, 0xdd, 0x98, 0x30, 0x8e, 0x1c, 0x28, 0xe2, 0x88, 0x37, 0x8c, 0x75, 0x63, 0xa3, 0xe8,
0xad, 0x92, 0x2b, 0xff, 0x24, 0x04, 0x8c, 0x31, 0xe3, 0xa2, 0x59, 0xdc, 0x2c, 0x6c, 0x55, 0x5d, 0x89, 0x3f, 0x11, 0x02, 0x33, 0x20, 0x8c, 0x37, 0x0a, 0xeb, 0xc6, 0x46, 0xc5, 0x93, 0x7f, 0xa3,
0xfc, 0x9b, 0xb4, 0xe1, 0x76, 0x40, 0x2f, 0x3d, 0xfe, 0x9e, 0xc6, 0x5e, 0x12, 0x4d, 0x85, 0x1f, 0x16, 0xdc, 0x8e, 0xf0, 0x85, 0xcf, 0x3e, 0xe0, 0xc4, 0x4f, 0xe9, 0x98, 0x87, 0xf1, 0x99, 0x7f,
0x9e, 0x7b, 0x67, 0x8c, 0x35, 0x4b, 0xb8, 0x6d, 0x25, 0xa0, 0x97, 0x83, 0xf7, 0x34, 0x76, 0xd5, 0x4a, 0x48, 0xa3, 0x28, 0xa7, 0x2d, 0x45, 0xf8, 0xa2, 0xff, 0x01, 0x27, 0x9e, 0x1a, 0x79, 0x41,
0xca, 0x73, 0xc6, 0xc8, 0x53, 0x58, 0x93, 0x1b, 0xe2, 0x84, 0xc5, 0xf4, 0x6a, 0x6e, 0x8b, 0x81, 0x08, 0x7a, 0x0a, 0x2b, 0x62, 0x42, 0x92, 0x92, 0x04, 0x5f, 0xce, 0x4c, 0x31, 0xe5, 0x94, 0xe5,
0x5b, 0x56, 0x03, 0x7a, 0x79, 0x82, 0x8b, 0xb9, 0x4d, 0x9b, 0x60, 0x66, 0xa7, 0x48, 0xea, 0x12, 0x08, 0x5f, 0xf4, 0xe4, 0x60, 0x6e, 0xd2, 0x3a, 0x58, 0xd9, 0x2a, 0x82, 0xba, 0x20, 0xa9, 0xa0,
0x52, 0x41, 0xab, 0x4b, 0xc6, 0xff, 0xc1, 0xca, 0xc9, 0xca, 0xc0, 0x97, 0x91, 0x63, 0x66, 0x72, 0xd5, 0x05, 0xe3, 0x5b, 0xb0, 0x73, 0xb2, 0xa2, 0xf0, 0x45, 0xc9, 0xb1, 0x32, 0xb9, 0xed, 0x88,
0x9d, 0x40, 0x10, 0x07, 0xea, 0x92, 0x15, 0xf8, 0x21, 0x4b, 0x50, 0xa8, 0x8c, 0xa4, 0x5a, 0x40, 0x23, 0x17, 0x6a, 0x82, 0x15, 0x85, 0x31, 0x49, 0xa5, 0x50, 0x49, 0x92, 0xaa, 0x11, 0xbe, 0x38,
0x2f, 0x0f, 0x25, 0x26, 0x95, 0xb6, 0xc0, 0x96, 0x39, 0xf3, 0xa2, 0xa9, 0xf0, 0x46, 0x17, 0x34, 0x10, 0x98, 0x50, 0xda, 0x00, 0x47, 0xf4, 0xcc, 0xa7, 0x63, 0xee, 0x0f, 0xcf, 0x71, 0x1c, 0x93,
0x0c, 0xd9, 0xa4, 0x59, 0xd9, 0x2c, 0x6c, 0x19, 0xae, 0x35, 0x51, 0x19, 0xea, 0x2a, 0x94, 0x6c, 0x51, 0xa3, 0xbc, 0x6e, 0x6c, 0x98, 0x9e, 0x3d, 0x52, 0x1d, 0x6a, 0x2b, 0x14, 0x6d, 0xc2, 0x12,
0xc3, 0x0a, 0x7f, 0xcf, 0x58, 0xec, 0x8d, 0xa2, 0xf0, 0xcc, 0x13, 0x34, 0x39, 0x67, 0xa2, 0x59, 0xfb, 0x40, 0x48, 0xe2, 0x0f, 0x69, 0x7c, 0xea, 0x73, 0x9c, 0x9e, 0x11, 0xde, 0xa8, 0xac, 0x1b,
0xdd, 0x2c, 0x6c, 0x2d, 0xb9, 0x0d, 0x5c, 0xe8, 0x46, 0xe1, 0xd9, 0x10, 0x61, 0xf2, 0x0c, 0x36, 0x1b, 0x0b, 0x5e, 0x5d, 0x0e, 0xb4, 0x69, 0x7c, 0x3a, 0x90, 0x30, 0x7a, 0x06, 0x6b, 0xb2, 0xfa,
0x30, 0xfa, 0x78, 0xfa, 0x66, 0xe2, 0x8f, 0x30, 0xf7, 0xde, 0x98, 0xd1, 0xf1, 0xc4, 0x0f, 0x59, 0x64, 0x7c, 0x32, 0x0a, 0x87, 0xb2, 0xf7, 0x7e, 0x40, 0x70, 0x30, 0x0a, 0x63, 0xd2, 0x00, 0x29,
0x13, 0x50, 0x7e, 0x5d, 0x12, 0x4e, 0x66, 0xeb, 0xbb, 0x7a, 0xd9, 0xf9, 0xa3, 0x00, 0x75, 0x59, 0xbf, 0x2a, 0x08, 0xbd, 0xe9, 0xf8, 0x8e, 0x1e, 0x76, 0xff, 0x32, 0xa0, 0x26, 0x0e, 0xa7, 0x1b,
0x9c, 0x7e, 0xf8, 0xe9, 0xda, 0x5c, 0xcf, 0x50, 0x71, 0x21, 0x43, 0x0b, 0x77, 0x2f, 0x2d, 0xde, 0xdf, 0x7c, 0x36, 0x57, 0x3b, 0x54, 0x98, 0xeb, 0xd0, 0xdc, 0xde, 0x8b, 0xf3, 0x7b, 0x7f, 0x08,
0xfd, 0x21, 0x34, 0xf0, 0xee, 0x7e, 0x98, 0x5d, 0xdd, 0xc0, 0xd8, 0xea, 0x13, 0x3c, 0x3f, 0xbd, 0x75, 0xb9, 0xf7, 0x30, 0xce, 0xb6, 0x6e, 0xca, 0xda, 0x6a, 0x23, 0xb9, 0xfe, 0x64, 0xe7, 0xdf,
0xf9, 0xff, 0xa0, 0xce, 0x2e, 0x05, 0x4b, 0x42, 0x3a, 0xf1, 0x2e, 0xc4, 0x64, 0x84, 0x05, 0xa9, 0x40, 0x8d, 0x5c, 0x70, 0x92, 0xc6, 0x78, 0xe4, 0x9f, 0xf3, 0xd1, 0x50, 0x1e, 0x48, 0xd9, 0xb3,
0xb8, 0x66, 0x0a, 0xee, 0x89, 0xc9, 0xc8, 0xe9, 0x80, 0x89, 0xb5, 0x67, 0x3c, 0x8e, 0x42, 0xce, 0x26, 0xe0, 0x2e, 0x1f, 0x0d, 0xdd, 0xb7, 0x60, 0xc9, 0xb3, 0x27, 0x2c, 0xa1, 0x31, 0x23, 0x08,
0x88, 0x05, 0x45, 0x7f, 0x8c, 0x31, 0x57, 0xdd, 0xa2, 0x3f, 0x26, 0xf7, 0xc1, 0x94, 0x7b, 0x3d, 0x41, 0x21, 0x0c, 0x64, 0xcd, 0x95, 0xe7, 0x85, 0x86, 0xe1, 0x15, 0xc2, 0x00, 0xad, 0x41, 0x39,
0x3a, 0x1e, 0x27, 0x8c, 0x73, 0xdd, 0x56, 0x35, 0x89, 0x75, 0x14, 0xe4, 0xd8, 0x60, 0x1d, 0x46, 0x0c, 0xfc, 0x93, 0x4b, 0x4e, 0x98, 0xac, 0xc7, 0xf2, 0x4a, 0x61, 0xf0, 0x5c, 0x7c, 0xa2, 0xfb,
0xa1, 0x2f, 0xa2, 0x44, 0xdf, 0xdc, 0xf9, 0xbb, 0x08, 0x20, 0x55, 0x07, 0x82, 0x8a, 0x29, 0xbf, 0x60, 0x09, 0x69, 0x1f, 0x07, 0x41, 0x4a, 0x18, 0xd3, 0xae, 0xab, 0x0a, 0x6c, 0x5b, 0x41, 0xae,
0x21, 0x11, 0xea, 0x94, 0x62, 0x76, 0xca, 0x03, 0x30, 0xc4, 0x55, 0xac, 0x6e, 0x6b, 0xed, 0xac, 0x03, 0xf6, 0x01, 0x8d, 0x43, 0x4e, 0x53, 0xdd, 0x18, 0xf7, 0xbf, 0x02, 0x80, 0x58, 0xb4, 0xcf,
0x3c, 0xd6, 0xf3, 0xf0, 0x58, 0x8a, 0x0c, 0xaf, 0x62, 0xe6, 0xe2, 0x32, 0xd9, 0x82, 0x25, 0x2e, 0x31, 0x1f, 0xb3, 0x6b, 0x3d, 0x2c, 0x8a, 0x28, 0xdc, 0x58, 0x44, 0x75, 0xb6, 0x88, 0x07, 0x60,
0xa8, 0x50, 0x5d, 0x68, 0xed, 0x90, 0x39, 0x9e, 0x3c, 0x8c, 0xb9, 0x8a, 0x40, 0xbe, 0x82, 0x86, 0xf2, 0xcb, 0x44, 0xf5, 0xca, 0xde, 0x5a, 0x7a, 0xac, 0x6f, 0xd3, 0x63, 0xb1, 0xc6, 0xe0, 0x32,
0x1f, 0xfa, 0xc2, 0x57, 0x35, 0x14, 0x7e, 0x90, 0xb6, 0xa3, 0x35, 0x83, 0x87, 0x7e, 0xa0, 0x1a, 0x21, 0x9e, 0x1c, 0x46, 0x1b, 0xb0, 0xc0, 0x38, 0xe6, 0xca, 0xc3, 0xf6, 0x16, 0x9a, 0xe1, 0x89,
0x89, 0x72, 0xe1, 0x4d, 0xe3, 0x31, 0x15, 0x4c, 0x31, 0x55, 0x53, 0x5a, 0x12, 0x3f, 0x45, 0x18, 0x5a, 0x88, 0xa7, 0x08, 0xe8, 0x3b, 0xa8, 0x87, 0x71, 0xc8, 0x43, 0xe5, 0x00, 0x1e, 0x46, 0x13,
0x99, 0xd7, 0x33, 0x51, 0x5e, 0xc8, 0x04, 0xb9, 0x07, 0xb5, 0x51, 0xc4, 0x85, 0xc7, 0x59, 0xf2, 0x33, 0xdb, 0x53, 0x78, 0x10, 0x46, 0xca, 0x86, 0x98, 0x71, 0x7f, 0x9c, 0x04, 0x98, 0x13, 0xc5,
0x8e, 0x25, 0xd8, 0x90, 0x25, 0x17, 0x24, 0x34, 0x40, 0x44, 0x6a, 0x20, 0x21, 0x0a, 0x47, 0x17, 0x54, 0x96, 0xb6, 0x05, 0x7e, 0x2c, 0x61, 0xc9, 0xbc, 0xda, 0xa8, 0xd2, 0x5c, 0xa3, 0xd0, 0x3d,
0xd4, 0x0f, 0xb1, 0x0f, 0x4b, 0x2e, 0x6e, 0x3a, 0x56, 0x90, 0xac, 0x9a, 0xa2, 0x9c, 0x9d, 0x29, 0xa8, 0x0e, 0x29, 0xe3, 0x3e, 0x23, 0xe9, 0x7b, 0x92, 0x4a, 0x3b, 0x17, 0x3d, 0x10, 0x50, 0x5f,
0x0e, 0xa8, 0x11, 0x41, 0x8e, 0xc6, 0x1c, 0x02, 0xf6, 0x81, 0xcf, 0x85, 0xbc, 0x36, 0x4f, 0x93, 0x22, 0x42, 0x43, 0x12, 0x68, 0x3c, 0x3c, 0xc7, 0x61, 0x2c, 0x5d, 0x5c, 0xf4, 0xe4, 0xa4, 0x23,
0xfe, 0x2d, 0xac, 0xe4, 0x30, 0x5d, 0xce, 0x47, 0xb0, 0x24, 0xbb, 0x8d, 0x37, 0x0b, 0x9b, 0xa5, 0x05, 0x89, 0x33, 0x57, 0x94, 0xd3, 0x53, 0xc5, 0x01, 0x75, 0xc1, 0x24, 0x47, 0x63, 0x2e, 0x02,
0xad, 0xda, 0xce, 0xea, 0x42, 0xc6, 0xa6, 0xdc, 0x55, 0x0c, 0xe7, 0x3e, 0x34, 0x24, 0xd8, 0x0f, 0x67, 0x3f, 0x64, 0x5c, 0x6c, 0x9b, 0x4d, 0xce, 0xe4, 0x47, 0x58, 0xca, 0x61, 0xda, 0x0c, 0x8f,
0xcf, 0xa2, 0xb4, 0x83, 0x67, 0xcd, 0x60, 0xca, 0x32, 0x39, 0x16, 0x98, 0x43, 0x96, 0x04, 0xd9, 0x60, 0x41, 0x78, 0x95, 0x35, 0x8c, 0xf5, 0xe2, 0x46, 0x75, 0x6b, 0x79, 0xae, 0x63, 0x63, 0xe6,
0x91, 0x1f, 0xa1, 0xae, 0x7f, 0xeb, 0xe3, 0x1e, 0x42, 0x23, 0xf0, 0x43, 0xd5, 0xe0, 0x34, 0x88, 0x29, 0x86, 0x7b, 0x1f, 0xea, 0x02, 0xec, 0xc6, 0xa7, 0x74, 0xe2, 0x7f, 0x3b, 0xb3, 0x92, 0x25,
0xa6, 0xa1, 0xd0, 0x69, 0xaf, 0x07, 0x7e, 0x28, 0xd5, 0x3b, 0x08, 0x22, 0x2f, 0x1d, 0x04, 0xcd, 0x4e, 0xd0, 0xb5, 0xc1, 0x1a, 0x90, 0x34, 0xca, 0x96, 0xfc, 0x04, 0x35, 0xfd, 0xad, 0x97, 0x7b,
0x5b, 0xd6, 0x3c, 0x35, 0x0b, 0x8a, 0xb7, 0x6f, 0x54, 0x0a, 0x76, 0x71, 0xdf, 0xa8, 0x14, 0xed, 0x08, 0xf5, 0x28, 0x8c, 0xd5, 0xf5, 0xc0, 0x11, 0x1d, 0xc7, 0x5c, 0xb7, 0xbd, 0x16, 0x85, 0xb1,
0xd2, 0xbe, 0x51, 0x29, 0xd9, 0xc6, 0xbe, 0x51, 0x31, 0xec, 0xa5, 0x7d, 0xa3, 0x52, 0xb6, 0x2b, 0x50, 0xdf, 0x96, 0xa0, 0xe4, 0x4d, 0xae, 0x91, 0xe6, 0x2d, 0x6a, 0x9e, 0xba, 0x49, 0x8a, 0xb7,
0xce, 0x6f, 0x05, 0x30, 0xbf, 0x9f, 0x46, 0x82, 0x7d, 0x7a, 0xe2, 0xb0, 0x22, 0xb3, 0xb9, 0x2f, 0x67, 0x96, 0x0d, 0xa7, 0xb0, 0x67, 0x96, 0x0b, 0x4e, 0x71, 0xcf, 0x2c, 0x17, 0x1d, 0x73, 0xcf,
0xe2, 0xdc, 0xc3, 0x68, 0x36, 0xf2, 0x0b, 0x43, 0x52, 0x5a, 0x1c, 0x92, 0xcf, 0xfb, 0x82, 0xf1, 0x2c, 0x9b, 0xce, 0xc2, 0x9e, 0x59, 0x2e, 0x39, 0x65, 0xf7, 0x0f, 0x03, 0xac, 0x9f, 0xc6, 0x94,
0x79, 0x5f, 0xf8, 0xbd, 0x00, 0x75, 0x1d, 0xa4, 0x4e, 0xd2, 0x06, 0x54, 0x32, 0x07, 0x50, 0xa1, 0x93, 0x9b, 0xef, 0xab, 0x3c, 0x91, 0x69, 0x6a, 0x14, 0x64, 0x6a, 0xc0, 0x70, 0x1a, 0x18, 0x73,
0x96, 0xb9, 0x1e, 0xff, 0xbb, 0x00, 0x39, 0x73, 0x54, 0xf6, 0x50, 0x8d, 0x33, 0x67, 0xfc, 0x0f, 0x57, 0xac, 0x38, 0x7f, 0xc5, 0x3e, 0x9f, 0x2a, 0xe6, 0xe7, 0x53, 0xe5, 0x4f, 0x03, 0x6a, 0xba,
0x54, 0xaf, 0x3b, 0x43, 0x25, 0x48, 0x6d, 0x01, 0x8d, 0x4e, 0x06, 0x49, 0xaf, 0x02, 0x16, 0x0a, 0x48, 0xdd, 0xa4, 0x35, 0x28, 0x67, 0xf9, 0xa1, 0x4a, 0x2d, 0x31, 0x1d, 0x1e, 0x77, 0x01, 0x72,
0x0f, 0x5f, 0x01, 0x03, 0x6b, 0xd7, 0xc0, 0xe0, 0x14, 0xbe, 0x2b, 0x13, 0x75, 0x17, 0x60, 0x34, 0xd1, 0xaa, 0xc2, 0xa5, 0x92, 0x64, 0xb9, 0xfa, 0x15, 0x54, 0xae, 0xe6, 0x4a, 0x39, 0x9a, 0x84,
0x11, 0xef, 0xbc, 0x31, 0x9b, 0x08, 0x8a, 0x25, 0x5a, 0x72, 0xab, 0x12, 0xd9, 0x95, 0x80, 0xd3, 0x8a, 0x8c, 0x49, 0x51, 0x24, 0xbe, 0x8c, 0x48, 0xcc, 0x7d, 0xf9, 0x86, 0x98, 0xf2, 0xec, 0xea,
0x80, 0xfa, 0x30, 0xfa, 0x91, 0x85, 0x59, 0xa1, 0xbf, 0x01, 0x2b, 0x05, 0xf4, 0x25, 0xb6, 0x61, 0xb2, 0x38, 0x85, 0xef, 0x88, 0x46, 0xdd, 0x05, 0x18, 0x8e, 0xf8, 0x7b, 0x3f, 0x20, 0x23, 0x8e,
0x59, 0x20, 0xa2, 0x3b, 0x6b, 0x36, 0x8b, 0x07, 0x9c, 0x0a, 0x24, 0xbb, 0x9a, 0xe1, 0xfc, 0x59, 0xe5, 0x11, 0x2d, 0x78, 0x15, 0x81, 0xec, 0x08, 0xc0, 0xad, 0x43, 0x6d, 0x40, 0x7f, 0x26, 0x71,
0x84, 0x6a, 0x86, 0xca, 0x8c, 0xbf, 0xa1, 0x9c, 0x79, 0x01, 0x1d, 0xd1, 0x24, 0x8a, 0x42, 0xdd, 0x76, 0xd0, 0x3f, 0x80, 0x3d, 0x01, 0xf4, 0x26, 0x36, 0x61, 0x91, 0x4b, 0x44, 0x3b, 0x6b, 0x7a,
0x5f, 0xa6, 0x04, 0x0f, 0x35, 0x26, 0x07, 0x25, 0xbd, 0xc7, 0x05, 0xe5, 0x17, 0x98, 0x0a, 0xd3, 0x17, 0xf7, 0x19, 0xe6, 0x92, 0xec, 0x69, 0x86, 0xfb, 0x77, 0x01, 0x2a, 0x19, 0x2a, 0x3a, 0x7e,
0xad, 0x69, 0x6c, 0x8f, 0xf2, 0x0b, 0xf2, 0x08, 0xec, 0x94, 0x12, 0x27, 0xcc, 0x0f, 0xe8, 0xb9, 0x82, 0x19, 0xf1, 0x23, 0x3c, 0xc4, 0x29, 0xa5, 0xb1, 0xf6, 0x97, 0x25, 0xc0, 0x03, 0x8d, 0x89,
0xca, 0x89, 0xe9, 0x36, 0x34, 0x7e, 0xa2, 0x61, 0x39, 0xe4, 0xaa, 0xcb, 0xbc, 0x98, 0xfa, 0x63, 0x8b, 0x32, 0xd9, 0xc7, 0x39, 0x66, 0xe7, 0xb2, 0x15, 0x96, 0x57, 0xd5, 0xd8, 0x2e, 0x66, 0xe7,
0x2f, 0xe0, 0x54, 0xe8, 0x87, 0xcc, 0x52, 0xf8, 0x09, 0xf5, 0xc7, 0x87, 0x9c, 0x0a, 0xf2, 0x04, 0xe8, 0x11, 0x38, 0x13, 0x4a, 0x92, 0x92, 0x30, 0xc2, 0x67, 0x44, 0x67, 0x5b, 0x5d, 0xe3, 0x3d,
0xee, 0xe4, 0x5e, 0xbb, 0x1c, 0x5d, 0xb5, 0x31, 0x49, 0xb2, 0xe7, 0x2e, 0xdb, 0x72, 0x1f, 0x4c, 0x0d, 0x8b, 0x4b, 0xae, 0x5c, 0xe6, 0x27, 0x38, 0x0c, 0xfc, 0x88, 0x61, 0xae, 0x9f, 0x41, 0x5b,
0xe9, 0x1a, 0xde, 0x28, 0x61, 0x54, 0xb0, 0xb1, 0x6e, 0xe4, 0x9a, 0xc4, 0xba, 0x0a, 0x22, 0x4d, 0xe1, 0x3d, 0x1c, 0x06, 0x07, 0x0c, 0x73, 0xf4, 0x04, 0xee, 0xe4, 0xde, 0xca, 0x1c, 0x5d, 0xd9,
0x28, 0xb3, 0xcb, 0xd8, 0x4f, 0xd8, 0x18, 0x5d, 0xa3, 0xe2, 0xa6, 0x3f, 0xe5, 0x66, 0x2e, 0xa2, 0x18, 0xa5, 0xd9, 0x63, 0x99, 0x4d, 0xb9, 0x0f, 0x96, 0x48, 0x0d, 0x7f, 0x98, 0x12, 0xcc, 0x49,
0x84, 0x9e, 0x33, 0x2f, 0xa4, 0x01, 0x43, 0xcb, 0xa8, 0xba, 0x35, 0x8d, 0x1d, 0xd1, 0x80, 0x6d, 0xa0, 0x8d, 0x5c, 0x15, 0x58, 0x5b, 0x41, 0xa8, 0x01, 0x25, 0x72, 0x91, 0x84, 0x29, 0x09, 0x64,
0x3f, 0x80, 0x4a, 0x6a, 0x83, 0xc4, 0x84, 0xca, 0xc1, 0xf1, 0xf1, 0x89, 0x77, 0x7c, 0x3a, 0xb4, 0x6a, 0x94, 0xbd, 0xc9, 0xa7, 0x98, 0xcc, 0x38, 0x4d, 0xf1, 0x19, 0xf1, 0x63, 0x1c, 0x11, 0x19,
0x6f, 0x91, 0x1a, 0x94, 0xf1, 0x57, 0xff, 0xc8, 0x2e, 0x6c, 0x73, 0xa8, 0x66, 0x2e, 0x48, 0xea, 0x19, 0x15, 0xaf, 0xaa, 0xb1, 0x43, 0x1c, 0x91, 0xcd, 0x07, 0x50, 0x9e, 0xc4, 0x20, 0xb2, 0xa0,
0x50, 0xed, 0x1f, 0xf5, 0x87, 0xfd, 0xce, 0xb0, 0xb7, 0x6b, 0xdf, 0x22, 0x77, 0x60, 0xe5, 0xc4, 0xbc, 0x7f, 0x74, 0xd4, 0xf3, 0x8f, 0x8e, 0x07, 0xce, 0x2d, 0x54, 0x85, 0x92, 0xfc, 0xea, 0x1e,
0xed, 0xf5, 0x0f, 0x3b, 0x2f, 0x7a, 0x9e, 0xdb, 0x7b, 0xd9, 0xeb, 0x1c, 0xf4, 0x76, 0xed, 0x02, 0x3a, 0xc6, 0x26, 0x83, 0x4a, 0x96, 0x82, 0xa8, 0x06, 0x95, 0xee, 0x61, 0x77, 0xd0, 0xdd, 0x1e,
0x21, 0x60, 0xed, 0x0d, 0x0f, 0xba, 0xde, 0xc9, 0xe9, 0x77, 0x07, 0xfd, 0xc1, 0x5e, 0x6f, 0xd7, 0x74, 0x76, 0x9c, 0x5b, 0xe8, 0x0e, 0x2c, 0xf5, 0xbc, 0x4e, 0xf7, 0x60, 0xfb, 0x65, 0xc7, 0xf7,
0x2e, 0x4a, 0xcd, 0xc1, 0x69, 0xb7, 0xdb, 0x1b, 0x0c, 0xec, 0x12, 0x01, 0x58, 0x7e, 0xde, 0xe9, 0x3a, 0xaf, 0x3a, 0xdb, 0xfb, 0x9d, 0x1d, 0xc7, 0x40, 0x08, 0xec, 0xdd, 0xc1, 0x7e, 0xdb, 0xef,
0x4b, 0xb2, 0x41, 0x56, 0xa1, 0xd1, 0x3f, 0x7a, 0x79, 0xdc, 0xef, 0xf6, 0xbc, 0x41, 0x6f, 0x38, 0x1d, 0x3f, 0xdf, 0xef, 0xf6, 0x77, 0x3b, 0x3b, 0x4e, 0x41, 0x68, 0xf6, 0x8f, 0xdb, 0xed, 0x4e,
0x94, 0xe0, 0xd2, 0xce, 0xcf, 0x65, 0x65, 0xf4, 0x5d, 0xfc, 0x9a, 0x21, 0x2e, 0x94, 0xf5, 0xf7, 0xbf, 0xef, 0x14, 0x11, 0xc0, 0xe2, 0x8b, 0xed, 0xae, 0x20, 0x9b, 0x68, 0x19, 0xea, 0xdd, 0xc3,
0x09, 0x59, 0x9f, 0xf5, 0xc3, 0xdc, 0x17, 0x4b, 0xeb, 0xce, 0x9c, 0x05, 0xa5, 0xfd, 0xe4, 0xac, 0x57, 0x47, 0xdd, 0x76, 0xc7, 0xef, 0x77, 0x06, 0x03, 0x01, 0x2e, 0x6c, 0xfd, 0x5a, 0x52, 0xef,
0xff, 0xf4, 0xd7, 0x3f, 0xbf, 0x14, 0x57, 0x1c, 0xb3, 0xfd, 0xee, 0x49, 0x5b, 0x32, 0xda, 0xd1, 0x40, 0x5b, 0xfe, 0x16, 0x42, 0x1e, 0x94, 0xf4, 0xaf, 0x1b, 0xb4, 0x3a, 0xf5, 0xc3, 0xcc, 0xef,
0x54, 0x3c, 0x2b, 0x6c, 0x93, 0x63, 0x58, 0x56, 0xcf, 0x2a, 0x59, 0x9b, 0x93, 0xcc, 0xde, 0xd9, 0x9d, 0xe6, 0x9d, 0x99, 0x08, 0x9a, 0xf8, 0xc9, 0x5d, 0xfd, 0xe5, 0x9f, 0x7f, 0x7f, 0x2b, 0x2c,
0x4f, 0x29, 0xae, 0xa1, 0xa2, 0xed, 0xd4, 0x32, 0x45, 0x3f, 0x94, 0x82, 0x03, 0x28, 0xeb, 0xe7, 0xb9, 0x56, 0xeb, 0xfd, 0x93, 0x96, 0x60, 0xb4, 0xe8, 0x98, 0x3f, 0x33, 0x36, 0xd1, 0x11, 0x2c,
0x2a, 0x17, 0xe4, 0xfc, 0x03, 0xd6, 0xba, 0xc9, 0x27, 0x9d, 0x26, 0x0a, 0x12, 0x62, 0x67, 0x82, 0xaa, 0x47, 0x19, 0xad, 0xcc, 0x48, 0x66, 0xaf, 0xf4, 0x4d, 0x8a, 0x2b, 0x52, 0xd1, 0x71, 0xab,
0x81, 0xda, 0xf5, 0x75, 0x81, 0xbc, 0x86, 0x6a, 0x66, 0xbe, 0x64, 0x63, 0x16, 0xe8, 0x35, 0x93, 0x99, 0x62, 0x18, 0x0b, 0xc1, 0x3e, 0x94, 0xf4, 0x6b, 0x96, 0x2b, 0x72, 0xf6, 0x7d, 0x6b, 0x5e,
0x6e, 0xb5, 0x6e, 0x5a, 0x9a, 0x0f, 0x98, 0x58, 0x99, 0x3e, 0x1a, 0x33, 0x39, 0x55, 0x0d, 0x20, 0x97, 0x93, 0x6e, 0x43, 0x0a, 0x22, 0xe4, 0x64, 0x82, 0x91, 0x9a, 0xf5, 0xbd, 0x81, 0xde, 0x40,
0x8d, 0x99, 0x34, 0xe7, 0x02, 0xcb, 0x79, 0xf5, 0xcd, 0x21, 0xb7, 0x50, 0xf2, 0x36, 0x21, 0x73, 0x25, 0x0b, 0x5f, 0xb4, 0x36, 0x2d, 0xf4, 0x4a, 0x48, 0x37, 0x9b, 0xd7, 0x0d, 0xcd, 0x16, 0x8c,
0x92, 0xed, 0x0f, 0xfe, 0xf8, 0x23, 0x79, 0x05, 0xa6, 0x2e, 0x0d, 0x7a, 0x38, 0x99, 0xa5, 0x31, 0xec, 0x4c, 0x5f, 0x06, 0x33, 0x3a, 0x56, 0x06, 0x10, 0xc1, 0x8c, 0x1a, 0x33, 0x85, 0xe5, 0xb2,
0xef, 0xf1, 0xad, 0xb5, 0xeb, 0xb0, 0x8e, 0x76, 0x51, 0x3a, 0x9a, 0x8a, 0xb6, 0x40, 0x29, 0x2f, 0xfa, 0xfa, 0x92, 0x9b, 0x52, 0xf2, 0x36, 0x42, 0x33, 0x92, 0xad, 0x8f, 0x61, 0xf0, 0x09, 0xbd,
0x93, 0x46, 0xe7, 0xcb, 0x49, 0xe7, 0xed, 0x3a, 0x27, 0x3d, 0x67, 0x90, 0xce, 0x26, 0x4a, 0xb7, 0x06, 0x4b, 0x1f, 0x8d, 0xcc, 0x70, 0x34, 0x6d, 0x63, 0x3e, 0xe3, 0x9b, 0x2b, 0x57, 0x61, 0x5d,
0x48, 0x73, 0x4e, 0xfa, 0xad, 0xe4, 0xb4, 0x3f, 0xd0, 0x40, 0x7c, 0x24, 0xaf, 0xc1, 0x7a, 0xc1, 0xed, 0xbc, 0x34, 0x1d, 0xf3, 0x16, 0x97, 0x52, 0x7e, 0x26, 0x2d, 0x93, 0x2f, 0x27, 0x9d, 0x8f,
0x84, 0x6a, 0x83, 0x2f, 0x8a, 0x7e, 0x03, 0x8f, 0x58, 0x25, 0x2b, 0xb9, 0xe6, 0xd0, 0xc1, 0xff, 0xeb, 0x9c, 0xf4, 0x4c, 0x40, 0xba, 0xeb, 0x52, 0xba, 0x89, 0x1a, 0x33, 0xd2, 0xef, 0x04, 0xa7,
0x90, 0xd3, 0xfe, 0xa2, 0xf0, 0xef, 0xa1, 0xf6, 0x06, 0x59, 0xcf, 0x6b, 0xe7, 0xa3, 0x7f, 0x05, 0xf5, 0x11, 0x47, 0xfc, 0x13, 0x7a, 0x03, 0xf6, 0x4b, 0xc2, 0x95, 0x0d, 0xbe, 0xa8, 0xfa, 0x35,
0x75, 0x79, 0x42, 0xea, 0x88, 0x3c, 0xd7, 0xd9, 0x73, 0xb6, 0xdb, 0x5a, 0x5f, 0xc0, 0xe7, 0xa7, 0xb9, 0xc4, 0x32, 0x5a, 0xca, 0x99, 0x43, 0x17, 0xff, 0x36, 0xa7, 0xfd, 0x45, 0xe5, 0xdf, 0x93,
0x85, 0x34, 0xf0, 0x08, 0x4e, 0x45, 0x5b, 0x59, 0xed, 0x9b, 0x65, 0xfc, 0x4f, 0xe1, 0xe9, 0xbf, 0xda, 0x6b, 0x68, 0x35, 0xaf, 0x9d, 0xaf, 0xfe, 0x35, 0xd4, 0xc4, 0x0a, 0x93, 0x44, 0x64, 0x39,
0x01, 0x00, 0x00, 0xff, 0xff, 0x63, 0x64, 0x76, 0xf5, 0x60, 0x0c, 0x00, 0x00, 0x67, 0xcf, 0xc4, 0x6e, 0x73, 0x75, 0x0e, 0x9f, 0xbd, 0x2d, 0xa8, 0x2e, 0x97, 0x60, 0x98, 0xb7,
0x54, 0xd4, 0x9e, 0x2c, 0xca, 0xff, 0x33, 0x9e, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x04, 0xc2,
0xbc, 0x71, 0x9e, 0x0c, 0x00, 0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

@ -231,8 +231,16 @@ message SwapResponse {
/** /**
Swap identifier to track status in the update stream that is returned from Swap identifier to track status in the update stream that is returned from
the Start() call. Currently this is the hash that locks the htlcs. the Start() call. Currently this is the hash that locks the htlcs.
DEPRECATED: To make the API more consistent, this field is deprecated in
favor of id_bytes and will be removed in a future release.
*/ */
string id = 1; string id = 1 [deprecated = true];
/**
Swap identifier to track status in the update stream that is returned from
the Start() call. Currently this is the hash that locks the htlcs.
*/
bytes id_bytes = 3;
/** /**
The address of the on-chain htlc. The address of the on-chain htlc.
@ -250,11 +258,19 @@ message SwapStatus {
*/ */
int64 amt = 1; int64 amt = 1;
/**
Swap identifier to track status in the update stream that is returned from
the Start() call. Currently this is the hash that locks the htlcs.
DEPRECATED: To make the API more consistent, this field is deprecated in
favor of id_bytes and will be removed in a future release.
*/
string id = 2 [deprecated = true];
/** /**
Swap identifier to track status in the update stream that is returned from Swap identifier to track status in the update stream that is returned from
the Start() call. Currently this is the hash that locks the htlcs. the Start() call. Currently this is the hash that locks the htlcs.
*/ */
string id = 2; bytes id_bytes = 11;
/** /**
Swap type Swap type

@ -460,6 +460,11 @@
"properties": { "properties": {
"id": { "id": {
"type": "string", "type": "string",
"description": "*\nSwap identifier to track status in the update stream that is returned from\nthe Start() call. Currently this is the hash that locks the htlcs.\nDEPRECATED: To make the API more consistent, this field is deprecated in\nfavor of id_bytes and will be removed in a future release."
},
"id_bytes": {
"type": "string",
"format": "byte",
"description": "*\nSwap identifier to track status in the update stream that is returned from\nthe Start() call. Currently this is the hash that locks the htlcs." "description": "*\nSwap identifier to track status in the update stream that is returned from\nthe Start() call. Currently this is the hash that locks the htlcs."
}, },
"htlc_address": { "htlc_address": {
@ -491,6 +496,11 @@
}, },
"id": { "id": {
"type": "string", "type": "string",
"description": "*\nSwap identifier to track status in the update stream that is returned from\nthe Start() call. Currently this is the hash that locks the htlcs.\nDEPRECATED: To make the API more consistent, this field is deprecated in\nfavor of id_bytes and will be removed in a future release."
},
"id_bytes": {
"type": "string",
"format": "byte",
"description": "*\nSwap identifier to track status in the update stream that is returned from\nthe Start() call. Currently this is the hash that locks the htlcs." "description": "*\nSwap identifier to track status in the update stream that is returned from\nthe Start() call. Currently this is the hash that locks the htlcs."
}, },
"type": { "type": {

Loading…
Cancel
Save