From 7e55458ff65b89b205cc56475b987d24faed490a Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Thu, 3 Sep 2020 15:22:50 +0200 Subject: [PATCH] clmrpc: add ReservedValue to listorders --- clmrpc/trader.pb.go | 260 +++++++++++++++++++------------------ clmrpc/trader.proto | 4 + clmrpc/trader.swagger.json | 5 + rpcserver.go | 14 ++ 4 files changed, 159 insertions(+), 124 deletions(-) diff --git a/clmrpc/trader.pb.go b/clmrpc/trader.pb.go index f5489d3..fe76b0a 100644 --- a/clmrpc/trader.pb.go +++ b/clmrpc/trader.pb.go @@ -1439,7 +1439,10 @@ type Order struct { //The number of currently unfilled units of this order. This will be equal to //the total amount of units until the order has reached the state PARTIAL_FILL //or EXECUTED. - UnitsUnfulfilled uint32 `protobuf:"varint,8,opt,name=units_unfulfilled,json=unitsUnfulfilled,proto3" json:"units_unfulfilled,omitempty"` + UnitsUnfulfilled uint32 `protobuf:"varint,8,opt,name=units_unfulfilled,json=unitsUnfulfilled,proto3" json:"units_unfulfilled,omitempty"` + // The value reserved from the account by this order to ensure the account + // can pay execution and chain fees in case it gets matched. + ReservedValueSat uint64 `protobuf:"varint,9,opt,name=reserved_value_sat,json=reservedValueSat,proto3" json:"reserved_value_sat,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1526,6 +1529,13 @@ func (m *Order) GetUnitsUnfulfilled() uint32 { return 0 } +func (m *Order) GetReservedValueSat() uint64 { + if m != nil { + return m.ReservedValueSat + } + return 0 +} + type Bid struct { // //The common fields shared between both ask and bid order types. @@ -2021,130 +2031,132 @@ func init() { func init() { proto.RegisterFile("trader.proto", fileDescriptor_b8f61804588c75fe) } var fileDescriptor_b8f61804588c75fe = []byte{ - // 1968 bytes of a gzipped FileDescriptorProto + // 1988 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, - 0x11, 0x16, 0xf5, 0x56, 0xf1, 0xa9, 0xa6, 0x24, 0xd3, 0xb4, 0x65, 0xcb, 0xe3, 0x3c, 0x64, 0x6d, - 0x20, 0x62, 0x95, 0x2c, 0x82, 0xec, 0x02, 0x59, 0x88, 0x12, 0xb5, 0x14, 0xd6, 0x2b, 0x29, 0x23, - 0xad, 0xbd, 0x49, 0x0e, 0x83, 0xe6, 0x4c, 0x53, 0x6c, 0x68, 0x1e, 0xf4, 0x74, 0x8f, 0x44, 0x23, - 0xc8, 0x25, 0xc9, 0x3d, 0x08, 0xfc, 0x1b, 0xf2, 0x2b, 0x72, 0x0d, 0x72, 0xca, 0x2d, 0x7f, 0x21, - 0x3f, 0x24, 0xe8, 0x9e, 0xee, 0x79, 0x91, 0xf2, 0x23, 0x37, 0xce, 0x57, 0xd5, 0xfd, 0x55, 0x55, - 0x57, 0x75, 0x55, 0x13, 0x2a, 0x3c, 0xc4, 0x0e, 0x09, 0xf7, 0xc7, 0x61, 0xc0, 0x03, 0xb4, 0x6c, - 0xbb, 0x5e, 0x38, 0xb6, 0xdb, 0x8f, 0xaf, 0x83, 0xe0, 0xda, 0x25, 0x1d, 0x3c, 0xa6, 0x1d, 0xec, - 0xfb, 0x01, 0xc7, 0x9c, 0x06, 0x3e, 0x8b, 0xb5, 0xda, 0x0d, 0x1c, 0xd9, 0xe2, 0x9b, 0xe8, 0x75, - 0xc6, 0xbf, 0x4b, 0x80, 0x4e, 0x7d, 0xca, 0x0f, 0x6d, 0x3b, 0x88, 0x7c, 0x6e, 0x92, 0x37, 0x11, - 0x61, 0x1c, 0x3d, 0x87, 0x2a, 0x8e, 0x11, 0xeb, 0x16, 0xbb, 0x11, 0x69, 0x95, 0x76, 0x4a, 0xbb, - 0x8b, 0x66, 0x45, 0x81, 0xaf, 0x04, 0x86, 0x5e, 0x40, 0x1d, 0x0f, 0x58, 0xe0, 0x46, 0x9c, 0x58, - 0x23, 0x42, 0xaf, 0x47, 0xbc, 0x35, 0xbf, 0x53, 0xda, 0xad, 0xf6, 0xe7, 0xcc, 0x9a, 0x16, 0xf4, - 0x25, 0x2e, 0x54, 0x43, 0xe2, 0x62, 0x4e, 0x6f, 0x13, 0xd5, 0x05, 0xad, 0xaa, 0x05, 0x4a, 0xf5, - 0x19, 0x94, 0xed, 0xc0, 0x1f, 0x5a, 0x1c, 0x87, 0xd7, 0x84, 0xb7, 0x16, 0xa5, 0x5a, 0xc9, 0x04, - 0x01, 0x5e, 0x49, 0xac, 0xdb, 0x80, 0x9a, 0xb6, 0x8e, 0x4c, 0xc6, 0x34, 0x7c, 0xdb, 0x5d, 0x86, - 0xc5, 0x21, 0x21, 0xcc, 0x20, 0xd0, 0xfc, 0x4d, 0x14, 0x70, 0xf2, 0xff, 0xb8, 0x53, 0x20, 0xd6, - 0xae, 0x64, 0x89, 0x35, 0xcd, 0x1d, 0x6c, 0xe4, 0x69, 0xd8, 0x38, 0xf0, 0x19, 0x41, 0xbf, 0x84, - 0x87, 0x1e, 0xf5, 0x49, 0x68, 0x0d, 0x09, 0xb1, 0x42, 0xcc, 0x89, 0xc5, 0x30, 0xb7, 0xc6, 0x24, - 0xb4, 0x6e, 0xee, 0x14, 0xe7, 0x86, 0x54, 0x38, 0x21, 0xc4, 0xc4, 0x9c, 0x5c, 0x62, 0x7e, 0x41, - 0xc2, 0x6f, 0xef, 0xd0, 0x4f, 0xa0, 0x9e, 0x2e, 0xe4, 0x01, 0xc7, 0xae, 0xe4, 0x5f, 0x34, 0xab, - 0x5a, 0xfd, 0x4a, 0x80, 0xc6, 0x26, 0x34, 0x5f, 0x52, 0xa6, 0x4f, 0x8b, 0x29, 0xff, 0x8c, 0x23, - 0xd8, 0xc8, 0xc3, 0xca, 0x9e, 0xcf, 0x60, 0x55, 0xb9, 0xc8, 0x5a, 0xa5, 0x9d, 0x85, 0xdd, 0xf2, - 0x41, 0x7d, 0x3f, 0x4e, 0x94, 0x7d, 0x6d, 0x7a, 0xa2, 0x60, 0x7c, 0x0d, 0xcb, 0xe7, 0x11, 0x1f, - 0x47, 0x1c, 0x3d, 0x82, 0x35, 0x19, 0x26, 0x61, 0xbd, 0x32, 0x7b, 0x55, 0x02, 0x97, 0x98, 0xa3, - 0x16, 0xac, 0x60, 0xc7, 0x09, 0x09, 0x63, 0xd2, 0xc4, 0x35, 0x53, 0x7f, 0x1a, 0x7f, 0x29, 0x41, - 0x35, 0xde, 0xe1, 0x35, 0xe5, 0xa3, 0x13, 0x42, 0xb2, 0xba, 0xa5, 0x9c, 0xee, 0x47, 0x04, 0x1b, - 0xed, 0x43, 0x73, 0x56, 0x18, 0x45, 0xde, 0x2c, 0xf6, 0xe7, 0xcc, 0xfa, 0x30, 0x1f, 0xc3, 0xe4, - 0x70, 0xba, 0xb0, 0x15, 0x5b, 0xc1, 0x84, 0x19, 0xa7, 0xde, 0xd8, 0xa5, 0x36, 0xe5, 0xc2, 0x9c, - 0x5d, 0x58, 0x09, 0x62, 0x89, 0x8a, 0x46, 0x4d, 0x47, 0x23, 0x5e, 0x60, 0x6a, 0xb1, 0xf1, 0xaf, - 0x12, 0x34, 0x8f, 0xdc, 0x80, 0x15, 0x13, 0x69, 0x1b, 0x20, 0x2e, 0x3b, 0xeb, 0x86, 0xbc, 0x95, - 0x3e, 0x55, 0xcc, 0xb5, 0x18, 0xf9, 0x96, 0xbc, 0x45, 0x5f, 0x43, 0x3d, 0xde, 0xc1, 0xba, 0xa3, - 0x7c, 0x24, 0x0e, 0x53, 0x7a, 0x56, 0x3e, 0xd8, 0xcc, 0x13, 0xa9, 0xf8, 0xf4, 0xe7, 0xcc, 0x6a, - 0x90, 0x0b, 0xd8, 0x97, 0xa9, 0x85, 0x0b, 0x72, 0xe1, 0x93, 0xfc, 0xc2, 0xa2, 0x4b, 0xfd, 0xb9, - 0xc4, 0xe6, 0x6e, 0x13, 0xd6, 0x87, 0x91, 0xef, 0x30, 0xcb, 0x21, 0x8c, 0x53, 0x5f, 0x16, 0xbe, - 0xf1, 0x05, 0x6c, 0xe4, 0xfd, 0x50, 0x99, 0xb1, 0x0d, 0x60, 0x0b, 0xdc, 0xe2, 0x13, 0xea, 0x68, - 0x47, 0x24, 0x72, 0x35, 0xa1, 0x8e, 0xf1, 0xd7, 0x12, 0x6c, 0x09, 0x2a, 0x27, 0xc4, 0x77, 0x9f, - 0x16, 0x82, 0x4c, 0x8c, 0xe7, 0xdf, 0x1b, 0x63, 0xf4, 0xb3, 0xf7, 0x9c, 0xef, 0xd4, 0xe9, 0x1a, - 0x14, 0x1e, 0x4c, 0x19, 0xa4, 0x7c, 0x79, 0x01, 0x2b, 0x2a, 0x89, 0xa5, 0x39, 0x33, 0x92, 0x5c, - 0xcb, 0xc5, 0x45, 0x70, 0xa7, 0x76, 0x89, 0x3d, 0x9f, 0x97, 0xf6, 0x57, 0x34, 0x28, 0x9d, 0xff, - 0x73, 0x09, 0x36, 0x8f, 0xc9, 0x38, 0x60, 0x53, 0xd7, 0xe2, 0x07, 0x7c, 0xdf, 0x06, 0xc0, 0x9e, - 0xbc, 0x65, 0x44, 0xe1, 0xc4, 0x05, 0xbc, 0x16, 0x23, 0xa2, 0x72, 0x3e, 0xcd, 0xe1, 0x21, 0x6c, - 0x15, 0x8d, 0xf8, 0x74, 0x7f, 0x9f, 0x41, 0xc5, 0x89, 0x37, 0xc9, 0xba, 0x5b, 0x56, 0x98, 0xf4, - 0xd6, 0x81, 0xcd, 0x6e, 0xe4, 0x8d, 0xd5, 0x52, 0x71, 0x31, 0x7d, 0x9c, 0xb3, 0xf7, 0x78, 0x33, - 0x3f, 0xdb, 0x9b, 0x16, 0x6c, 0x15, 0x59, 0x62, 0x6f, 0x8c, 0x77, 0xf3, 0xb0, 0xa2, 0xe0, 0x0f, - 0x53, 0xae, 0x8a, 0xe4, 0x09, 0xa8, 0xcf, 0x55, 0x5d, 0x35, 0x32, 0xc9, 0x75, 0x21, 0x70, 0x33, - 0xd1, 0x40, 0x1b, 0xb0, 0x14, 0x5f, 0xf6, 0x71, 0x80, 0xe3, 0x0f, 0xf4, 0x19, 0xac, 0xe3, 0x5b, - 0x4c, 0x5d, 0x3c, 0x70, 0x89, 0x35, 0xc0, 0x2e, 0xf6, 0x6d, 0x22, 0x9b, 0xcc, 0xa2, 0xd9, 0x48, - 0x04, 0xdd, 0x18, 0x17, 0xca, 0xb2, 0xc1, 0xc8, 0x5a, 0xd2, 0x8d, 0x6b, 0x49, 0xdc, 0x55, 0x66, - 0x23, 0x15, 0xa8, 0xc6, 0xb5, 0x07, 0x4b, 0x8c, 0x63, 0x4e, 0x5a, 0xcb, 0x3b, 0xa5, 0xdd, 0xda, - 0xc1, 0x46, 0xe1, 0x50, 0x2e, 0x85, 0xcc, 0x8c, 0x55, 0xd0, 0x53, 0x28, 0xbb, 0x98, 0x13, 0xa6, - 0x8e, 0x65, 0x45, 0x7a, 0x0a, 0x31, 0x24, 0x4f, 0x05, 0x03, 0xba, 0x8c, 0x06, 0x1e, 0xe5, 0xe7, - 0xa1, 0x43, 0x42, 0x7d, 0x24, 0x4f, 0x61, 0x01, 0xb3, 0x1b, 0x75, 0xea, 0xe5, 0x84, 0x80, 0xdd, - 0xf4, 0xe7, 0x4c, 0x21, 0x11, 0x0a, 0x03, 0x75, 0xcc, 0x19, 0x85, 0x2e, 0x75, 0x84, 0xc2, 0x80, - 0x3a, 0xdd, 0x35, 0x58, 0x71, 0x08, 0xc7, 0xd4, 0x65, 0xc6, 0xdf, 0x4a, 0xd0, 0xcc, 0x71, 0xa8, - 0xf4, 0xfa, 0x0a, 0xaa, 0xd4, 0xbf, 0xc5, 0x2e, 0x75, 0xac, 0x40, 0x08, 0x14, 0x5d, 0xe2, 0xcf, - 0x69, 0x2c, 0x94, 0x8b, 0xfa, 0x73, 0x66, 0x85, 0x66, 0xbe, 0xd1, 0x01, 0x6c, 0x60, 0xdb, 0x26, - 0x63, 0x4e, 0xd4, 0x6a, 0xcb, 0x0f, 0x44, 0x84, 0x65, 0xe2, 0xf5, 0xe7, 0x4c, 0xa4, 0xa5, 0x52, - 0xfd, 0x4c, 0xc8, 0xb2, 0x36, 0x35, 0x61, 0x5d, 0x34, 0x32, 0x29, 0x4c, 0xba, 0xdb, 0x2b, 0x40, - 0x59, 0x50, 0x99, 0xf9, 0x14, 0x16, 0x31, 0xbb, 0xd1, 0x37, 0x79, 0x36, 0x18, 0xa6, 0x14, 0x08, - 0x85, 0x01, 0x75, 0xf4, 0x35, 0x94, 0x0d, 0x86, 0x29, 0x05, 0xc6, 0x17, 0x80, 0x8e, 0xc4, 0x31, - 0xbb, 0x85, 0x18, 0x97, 0xb3, 0x86, 0xc7, 0x49, 0x08, 0x41, 0x62, 0xae, 0xe8, 0xc1, 0xb9, 0x65, - 0x2a, 0x8f, 0xff, 0x3e, 0x0f, 0x4b, 0x71, 0x0c, 0x3e, 0x7c, 0x4b, 0xc8, 0xa2, 0x19, 0xd2, 0x09, - 0x89, 0x8f, 0xaa, 0x6a, 0xae, 0x09, 0xe4, 0x44, 0x00, 0xa8, 0x01, 0x0b, 0xd8, 0xe3, 0x2a, 0x69, - 0xc5, 0x4f, 0xf4, 0x6b, 0xd8, 0xf6, 0xf0, 0xc4, 0x1a, 0x60, 0x6e, 0x8f, 0x66, 0x4e, 0x16, 0x71, - 0xfa, 0x3e, 0xf0, 0xf0, 0xa4, 0x2b, 0x74, 0x8a, 0xc3, 0x45, 0xc1, 0xa3, 0xa5, 0xa2, 0x47, 0x68, - 0x37, 0x9f, 0xb9, 0x28, 0x29, 0x2a, 0xa1, 0x92, 0xcb, 0xdb, 0x0d, 0x58, 0x8a, 0x7c, 0xca, 0x99, - 0xcc, 0xd8, 0xaa, 0x19, 0x7f, 0x88, 0x32, 0x91, 0x3f, 0xac, 0xc8, 0x1f, 0x46, 0xee, 0x90, 0xba, - 0x2e, 0x71, 0x5a, 0xab, 0x71, 0x99, 0x48, 0xc1, 0xf7, 0x29, 0x6e, 0x4c, 0x60, 0xa1, 0x4b, 0x1d, - 0xf4, 0xd3, 0xe4, 0xd0, 0x55, 0x7e, 0x55, 0x73, 0xac, 0xa6, 0x96, 0x8a, 0x31, 0xc0, 0xa3, 0xbe, - 0xe5, 0x44, 0xaa, 0x0a, 0x07, 0x6e, 0x60, 0xdf, 0x30, 0x15, 0xb7, 0x75, 0x8f, 0xfa, 0xc7, 0x4a, - 0xd2, 0x95, 0x02, 0x31, 0x73, 0xdc, 0x92, 0x90, 0xd1, 0xc0, 0x8f, 0x47, 0x4c, 0x53, 0x7f, 0x0a, - 0xe6, 0x43, 0x76, 0xf3, 0x69, 0xcc, 0x78, 0x72, 0x2f, 0x33, 0x9e, 0x7c, 0x34, 0x73, 0x0b, 0xb6, - 0x4c, 0x62, 0x07, 0xb7, 0x24, 0x2c, 0x4e, 0x6e, 0xe7, 0xf0, 0x60, 0x4a, 0xa2, 0x12, 0xfc, 0x17, - 0xb0, 0xe5, 0x47, 0x9e, 0x15, 0xc6, 0x62, 0xe2, 0x58, 0x99, 0x51, 0x4e, 0xec, 0xbe, 0xe1, 0x47, - 0x9e, 0xa9, 0x85, 0x7a, 0xb5, 0xa8, 0xa0, 0xc3, 0x78, 0xc8, 0x4f, 0xaf, 0x72, 0xe3, 0x1c, 0x50, - 0x16, 0x54, 0x04, 0xbf, 0x82, 0x2a, 0x99, 0x10, 0x3b, 0x92, 0xce, 0x89, 0x59, 0xa5, 0x50, 0xe8, - 0x3d, 0x2d, 0x14, 0x8b, 0x2a, 0x24, 0xf3, 0x65, 0xd4, 0xa1, 0x7a, 0x15, 0xdc, 0x10, 0x3f, 0xf1, - 0xe3, 0x2b, 0xa8, 0x69, 0x20, 0xe9, 0x52, 0xcb, 0x5c, 0x22, 0xaa, 0x42, 0xd7, 0xf5, 0xb6, 0x2f, - 0x19, 0xe6, 0x52, 0xd7, 0x54, 0x0a, 0xc6, 0x3f, 0xe6, 0x61, 0x2d, 0x41, 0x45, 0x8f, 0x1e, 0x60, - 0x46, 0x2c, 0x0f, 0xdb, 0x38, 0x0c, 0x02, 0x5f, 0x55, 0x50, 0x45, 0x80, 0xdf, 0x29, 0x4c, 0x34, - 0xb6, 0x31, 0x7e, 0xeb, 0x11, 0x9f, 0x5b, 0x23, 0xcc, 0x46, 0xba, 0xb1, 0x29, 0xac, 0x8f, 0xd9, - 0x08, 0xbd, 0x80, 0x86, 0x56, 0x19, 0x87, 0x84, 0x7a, 0xf8, 0x3a, 0x6e, 0x05, 0x15, 0xb3, 0xae, - 0xf0, 0x0b, 0x05, 0xa3, 0x5d, 0x68, 0xa8, 0xc6, 0x3d, 0xc6, 0xd4, 0xb1, 0x3c, 0xd1, 0xbe, 0x45, - 0x51, 0x2d, 0x98, 0xb5, 0x18, 0xbf, 0xc0, 0xd4, 0xf9, 0x8e, 0x61, 0x8e, 0x3e, 0x87, 0xcd, 0x30, - 0x88, 0x38, 0xf5, 0xaf, 0x65, 0x25, 0xa6, 0xea, 0x4b, 0x52, 0x1d, 0x29, 0xe1, 0x09, 0x21, 0xc9, - 0x92, 0x67, 0x50, 0xe1, 0xd4, 0x23, 0x96, 0x1d, 0x12, 0xcc, 0x89, 0x23, 0x8b, 0x6c, 0xc1, 0x2c, - 0x0b, 0xec, 0x28, 0x86, 0x44, 0xe6, 0xc8, 0x76, 0x42, 0xe2, 0x56, 0xb0, 0x6a, 0xea, 0x4f, 0xb1, - 0x98, 0xf1, 0x20, 0xc4, 0xd7, 0xc4, 0xf2, 0xb1, 0x47, 0x64, 0x55, 0xad, 0x99, 0x65, 0x85, 0x9d, - 0x61, 0x8f, 0xec, 0xbd, 0x2b, 0x41, 0x25, 0xdb, 0x63, 0x50, 0x03, 0x2a, 0x17, 0xbd, 0xb3, 0xe3, - 0xd3, 0xb3, 0x6f, 0xac, 0xf3, 0x8b, 0xde, 0x59, 0x63, 0x0e, 0x21, 0xa8, 0x69, 0xe4, 0xfb, 0x8b, - 0xe3, 0xc3, 0xab, 0x5e, 0xa3, 0x84, 0x56, 0x61, 0x51, 0x4a, 0xe7, 0x51, 0x19, 0x56, 0x7a, 0x3f, - 0x5c, 0x9c, 0x9a, 0xbd, 0xe3, 0xc6, 0x42, 0x56, 0xf5, 0xe8, 0xe5, 0xf9, 0x65, 0xef, 0xb8, 0xb1, - 0x88, 0x00, 0x96, 0xd5, 0xef, 0x25, 0xd4, 0x84, 0xba, 0xd9, 0x3b, 0x3a, 0x7f, 0xd5, 0x33, 0x7f, - 0x6b, 0x9d, 0x1c, 0x9e, 0xbe, 0xec, 0x1d, 0x37, 0x96, 0xd1, 0x3a, 0x54, 0xf5, 0xa2, 0xee, 0xe1, - 0xd5, 0x51, 0xbf, 0xb1, 0x72, 0xf0, 0xcf, 0x32, 0x2c, 0x5f, 0xc9, 0x3b, 0x0f, 0xb9, 0x50, 0xc9, - 0xbe, 0x96, 0xd0, 0x23, 0x9d, 0x09, 0x33, 0x9e, 0x6a, 0xed, 0xc7, 0xb3, 0x85, 0xea, 0x92, 0x7d, - 0xf6, 0xa7, 0xff, 0xfc, 0xf7, 0xdd, 0xfc, 0x23, 0x63, 0xab, 0x73, 0xfb, 0x79, 0xc7, 0x76, 0xbd, - 0x8e, 0xae, 0x89, 0xce, 0x1b, 0xa1, 0xfe, 0x65, 0x69, 0x0f, 0xbd, 0x86, 0x72, 0xe6, 0x41, 0x8b, - 0xda, 0x69, 0xdb, 0x2a, 0x8e, 0x73, 0xed, 0xe2, 0xdc, 0x64, 0x3c, 0x92, 0xdb, 0x6f, 0x1a, 0x8d, - 0xe2, 0xf6, 0x62, 0x63, 0x1b, 0x2a, 0xd9, 0x47, 0x56, 0xea, 0xc6, 0x8c, 0x17, 0x59, 0xea, 0xc6, - 0xac, 0x77, 0x99, 0xd1, 0x92, 0x3c, 0x08, 0x4d, 0xf1, 0x08, 0x92, 0xec, 0xbc, 0x9e, 0x92, 0xcc, - 0x78, 0x8d, 0xa4, 0x24, 0xb3, 0x46, 0x7c, 0x4d, 0xb2, 0x37, 0x4d, 0x32, 0x81, 0x7a, 0x61, 0x96, - 0x46, 0xc9, 0x3b, 0x63, 0xf6, 0xd4, 0xdf, 0x7e, 0x7a, 0xaf, 0x5c, 0xb1, 0xfd, 0x48, 0xb2, 0x3d, - 0x31, 0x1e, 0x4e, 0x9d, 0x8c, 0x9e, 0xad, 0x45, 0x0c, 0x39, 0xd4, 0xf2, 0x43, 0x2d, 0xda, 0xd6, - 0x1b, 0xcf, 0x9c, 0xb8, 0xdb, 0x4f, 0xee, 0x13, 0x2b, 0xda, 0xe7, 0x92, 0x76, 0xdb, 0x68, 0x4d, - 0xd1, 0xaa, 0x19, 0x57, 0xb0, 0xbe, 0x81, 0x5a, 0x7e, 0xf8, 0x4c, 0x59, 0x67, 0x8e, 0xbe, 0x29, - 0xeb, 0x3d, 0x33, 0xeb, 0x8e, 0x64, 0x6d, 0x1b, 0x9b, 0x53, 0xac, 0x83, 0xc8, 0x1b, 0x0b, 0xca, - 0x3b, 0xa8, 0x17, 0xee, 0xf5, 0x34, 0xc4, 0xb3, 0x5b, 0x41, 0x1a, 0xe2, 0x7b, 0x1a, 0xc2, 0x7b, - 0x7c, 0x55, 0x3d, 0x42, 0x10, 0x63, 0x28, 0x67, 0x86, 0xba, 0x34, 0xfd, 0xa7, 0xa7, 0xc9, 0xf6, - 0xa3, 0x99, 0x32, 0x45, 0xf6, 0x50, 0x92, 0x35, 0x8d, 0x9a, 0x26, 0x93, 0xf3, 0x82, 0x2c, 0x84, - 0xdf, 0x03, 0xa4, 0xf3, 0x18, 0x7a, 0x98, 0xcd, 0xf4, 0xdc, 0xe0, 0xd6, 0x6e, 0xcf, 0x12, 0xa9, - 0xfd, 0xb7, 0xe4, 0xfe, 0x0d, 0x54, 0xd8, 0x1f, 0xb9, 0x50, 0xce, 0x4c, 0x57, 0xa9, 0xfd, 0xd3, - 0x93, 0x5a, 0x6a, 0xff, 0xac, 0x71, 0x4c, 0xe5, 0xe3, 0xde, 0xe3, 0xfc, 0xfe, 0x9d, 0x3f, 0x64, - 0x46, 0xa1, 0x3f, 0xa2, 0x1f, 0x00, 0xd2, 0xc6, 0x98, 0xba, 0x32, 0xd5, 0x41, 0x53, 0x57, 0xa6, - 0xfb, 0xa8, 0xd1, 0x94, 0x54, 0x55, 0x54, 0xd6, 0x54, 0x43, 0x42, 0x90, 0x0b, 0x55, 0x39, 0x8c, - 0x5d, 0xfa, 0x78, 0xcc, 0x46, 0x01, 0x47, 0x49, 0xb1, 0xe6, 0x60, 0xbd, 0xff, 0xf6, 0x3d, 0x52, - 0x45, 0xf1, 0x44, 0x52, 0xb4, 0x50, 0x72, 0xef, 0xc9, 0x61, 0xb0, 0xc3, 0xf4, 0xe6, 0xaf, 0xa1, - 0xfa, 0x0d, 0xe1, 0x49, 0x0f, 0x65, 0x28, 0xf9, 0xc3, 0x21, 0xd7, 0xa6, 0xdb, 0x5b, 0x45, 0x58, - 0xed, 0xff, 0x40, 0xee, 0xbf, 0x8e, 0xea, 0x62, 0x7f, 0x97, 0x61, 0xde, 0x89, 0x5b, 0x73, 0xf7, - 0xc7, 0xbf, 0x7b, 0x7e, 0x4d, 0xf9, 0x28, 0x1a, 0xec, 0xdb, 0x81, 0xd7, 0x71, 0xc5, 0x43, 0xc7, - 0xa7, 0xfe, 0xb5, 0x8b, 0x07, 0xac, 0xe3, 0xba, 0x5e, 0x27, 0xde, 0x6e, 0xb0, 0x2c, 0xff, 0x4d, - 0xfc, 0xf9, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7b, 0xab, 0x23, 0x55, 0x95, 0x14, 0x00, 0x00, + 0xf1, 0x17, 0xf5, 0x56, 0xf1, 0xa9, 0xa6, 0x24, 0xd3, 0xb4, 0x65, 0xcb, 0xe3, 0xff, 0x3f, 0x91, + 0xb5, 0x0b, 0x11, 0xab, 0x64, 0x11, 0x64, 0x17, 0xc8, 0x42, 0x94, 0xa8, 0xa5, 0xb0, 0x5e, 0x49, + 0x19, 0x69, 0xed, 0x4d, 0x72, 0x18, 0x34, 0x67, 0x9a, 0x62, 0x43, 0xf3, 0xa0, 0xa7, 0x7b, 0x24, + 0x1a, 0x41, 0x2e, 0x49, 0xee, 0x41, 0xe0, 0x8f, 0x93, 0x6b, 0x90, 0x53, 0x6e, 0xfb, 0x15, 0xf2, + 0x41, 0x82, 0x7e, 0xcd, 0x0c, 0x1f, 0xf2, 0x23, 0x37, 0xce, 0xaf, 0xaa, 0xfb, 0x57, 0x55, 0x5d, + 0xd5, 0x55, 0x4d, 0x28, 0xf1, 0x18, 0x7b, 0x24, 0xde, 0x1f, 0xc6, 0x11, 0x8f, 0xd0, 0xb2, 0xeb, + 0x07, 0xf1, 0xd0, 0x6d, 0x3e, 0xbe, 0x8e, 0xa2, 0x6b, 0x9f, 0xb4, 0xf0, 0x90, 0xb6, 0x70, 0x18, + 0x46, 0x1c, 0x73, 0x1a, 0x85, 0x4c, 0x69, 0x35, 0x6b, 0x38, 0x71, 0xc5, 0x37, 0x31, 0xeb, 0xac, + 0x7f, 0x17, 0x00, 0x9d, 0x86, 0x94, 0x1f, 0xba, 0x6e, 0x94, 0x84, 0xdc, 0x26, 0x6f, 0x12, 0xc2, + 0x38, 0x7a, 0x0e, 0x65, 0xac, 0x10, 0xe7, 0x16, 0xfb, 0x09, 0x69, 0x14, 0x76, 0x0a, 0xbb, 0x8b, + 0x76, 0x49, 0x83, 0xaf, 0x04, 0x86, 0x5e, 0x40, 0x15, 0xf7, 0x58, 0xe4, 0x27, 0x9c, 0x38, 0x03, + 0x42, 0xaf, 0x07, 0xbc, 0x31, 0xbf, 0x53, 0xd8, 0x2d, 0x77, 0xe7, 0xec, 0x8a, 0x11, 0x74, 0x25, + 0x2e, 0x54, 0x63, 0xe2, 0x63, 0x4e, 0x6f, 0x53, 0xd5, 0x05, 0xa3, 0x6a, 0x04, 0x5a, 0xf5, 0x19, + 0x14, 0xdd, 0x28, 0xec, 0x3b, 0x1c, 0xc7, 0xd7, 0x84, 0x37, 0x16, 0xa5, 0x5a, 0xc1, 0x06, 0x01, + 0x5e, 0x49, 0xac, 0x5d, 0x83, 0x8a, 0xb1, 0x8e, 0x8c, 0x86, 0x34, 0x7e, 0xdb, 0x5e, 0x86, 0xc5, + 0x3e, 0x21, 0xcc, 0x22, 0x50, 0xff, 0x6d, 0x12, 0x71, 0xf2, 0xbf, 0xb8, 0x33, 0x41, 0x6c, 0x5c, + 0xc9, 0x13, 0x1b, 0x9a, 0x3b, 0xd8, 0x18, 0xa7, 0x61, 0xc3, 0x28, 0x64, 0x04, 0xfd, 0x0a, 0x1e, + 0x06, 0x34, 0x24, 0xb1, 0xd3, 0x27, 0xc4, 0x89, 0x31, 0x27, 0x0e, 0xc3, 0xdc, 0x19, 0x92, 0xd8, + 0xb9, 0xb9, 0xd3, 0x9c, 0x1b, 0x52, 0xe1, 0x84, 0x10, 0x1b, 0x73, 0x72, 0x89, 0xf9, 0x05, 0x89, + 0xbf, 0xbb, 0x43, 0x3f, 0x83, 0x6a, 0xb6, 0x90, 0x47, 0x1c, 0xfb, 0x92, 0x7f, 0xd1, 0x2e, 0x1b, + 0xf5, 0x2b, 0x01, 0x5a, 0x9b, 0x50, 0x7f, 0x49, 0x99, 0x39, 0x2d, 0xa6, 0xfd, 0xb3, 0x8e, 0x60, + 0x63, 0x1c, 0xd6, 0xf6, 0x7c, 0x06, 0xab, 0xda, 0x45, 0xd6, 0x28, 0xec, 0x2c, 0xec, 0x16, 0x0f, + 0xaa, 0xfb, 0x2a, 0x51, 0xf6, 0x8d, 0xe9, 0xa9, 0x82, 0xf5, 0x0d, 0x2c, 0x9f, 0x27, 0x7c, 0x98, + 0x70, 0xf4, 0x08, 0xd6, 0x64, 0x98, 0x84, 0xf5, 0xda, 0xec, 0x55, 0x09, 0x5c, 0x62, 0x8e, 0x1a, + 0xb0, 0x82, 0x3d, 0x2f, 0x26, 0x8c, 0x49, 0x13, 0xd7, 0x6c, 0xf3, 0x69, 0xfd, 0xb5, 0x00, 0x65, + 0xb5, 0xc3, 0x6b, 0xca, 0x07, 0x27, 0x84, 0xe4, 0x75, 0x0b, 0x63, 0xba, 0x1f, 0x11, 0x6c, 0xb4, + 0x0f, 0xf5, 0x59, 0x61, 0x14, 0x79, 0xb3, 0xd8, 0x9d, 0xb3, 0xab, 0xfd, 0xf1, 0x18, 0xa6, 0x87, + 0xd3, 0x86, 0x2d, 0x65, 0x05, 0x13, 0x66, 0x9c, 0x06, 0x43, 0x9f, 0xba, 0x94, 0x0b, 0x73, 0x76, + 0x61, 0x25, 0x52, 0x12, 0x1d, 0x8d, 0x8a, 0x89, 0x86, 0x5a, 0x60, 0x1b, 0xb1, 0xf5, 0xaf, 0x02, + 0xd4, 0x8f, 0xfc, 0x88, 0x4d, 0x26, 0xd2, 0x36, 0x80, 0x2a, 0x3b, 0xe7, 0x86, 0xbc, 0x95, 0x3e, + 0x95, 0xec, 0x35, 0x85, 0x7c, 0x47, 0xde, 0xa2, 0x6f, 0xa0, 0xaa, 0x76, 0x70, 0xee, 0x28, 0x1f, + 0x88, 0xc3, 0x94, 0x9e, 0x15, 0x0f, 0x36, 0xc7, 0x89, 0x74, 0x7c, 0xba, 0x73, 0x76, 0x39, 0x1a, + 0x0b, 0xd8, 0x57, 0x99, 0x85, 0x0b, 0x72, 0xe1, 0x93, 0xf1, 0x85, 0x93, 0x2e, 0x75, 0xe7, 0x52, + 0x9b, 0xdb, 0x75, 0x58, 0xef, 0x27, 0xa1, 0xc7, 0x1c, 0x8f, 0x30, 0x4e, 0x43, 0x59, 0xf8, 0xd6, + 0x97, 0xb0, 0x31, 0xee, 0x87, 0xce, 0x8c, 0x6d, 0x00, 0x57, 0xe0, 0x0e, 0x1f, 0x51, 0xcf, 0x38, + 0x22, 0x91, 0xab, 0x11, 0xf5, 0xac, 0xbf, 0x15, 0x60, 0x4b, 0x50, 0x79, 0x31, 0xbe, 0xfb, 0xb4, + 0x10, 0xe4, 0x62, 0x3c, 0xff, 0xde, 0x18, 0xa3, 0xcf, 0xdf, 0x73, 0xbe, 0x53, 0xa7, 0x6b, 0x51, + 0x78, 0x30, 0x65, 0x90, 0xf6, 0xe5, 0x05, 0xac, 0xe8, 0x24, 0x96, 0xe6, 0xcc, 0x48, 0x72, 0x23, + 0x17, 0x17, 0xc1, 0x9d, 0xde, 0x45, 0x79, 0x3e, 0x2f, 0xed, 0x2f, 0x19, 0x50, 0x3a, 0xff, 0x97, + 0x02, 0x6c, 0x1e, 0x93, 0x61, 0xc4, 0xa6, 0xae, 0xc5, 0x0f, 0xf8, 0xbe, 0x0d, 0x80, 0x03, 0x79, + 0xcb, 0x88, 0xc2, 0x51, 0x05, 0xbc, 0xa6, 0x10, 0x51, 0x39, 0x9f, 0xe6, 0x70, 0x1f, 0xb6, 0x26, + 0x8d, 0xf8, 0x74, 0x7f, 0x9f, 0x41, 0xc9, 0x53, 0x9b, 0xe4, 0xdd, 0x2d, 0x6a, 0x4c, 0x7a, 0xeb, + 0xc1, 0x66, 0x3b, 0x09, 0x86, 0x7a, 0xa9, 0xb8, 0x98, 0x3e, 0xce, 0xd9, 0x7b, 0xbc, 0x99, 0x9f, + 0xed, 0x4d, 0x03, 0xb6, 0x26, 0x59, 0x94, 0x37, 0xd6, 0xbb, 0x79, 0x58, 0xd1, 0xf0, 0x87, 0x29, + 0x57, 0x45, 0xf2, 0x44, 0x34, 0xe4, 0xba, 0xae, 0x6a, 0xb9, 0xe4, 0xba, 0x10, 0xb8, 0x9d, 0x6a, + 0xa0, 0x0d, 0x58, 0x52, 0x97, 0xbd, 0x0a, 0xb0, 0xfa, 0x40, 0x9f, 0xc1, 0x3a, 0xbe, 0xc5, 0xd4, + 0xc7, 0x3d, 0x9f, 0x38, 0x3d, 0xec, 0xe3, 0xd0, 0x25, 0xb2, 0xc9, 0x2c, 0xda, 0xb5, 0x54, 0xd0, + 0x56, 0xb8, 0x50, 0x96, 0x0d, 0x46, 0xd6, 0x92, 0x69, 0x5c, 0x4b, 0xe2, 0xae, 0xb2, 0x6b, 0x99, + 0x40, 0x37, 0xae, 0x3d, 0x58, 0x62, 0x1c, 0x73, 0xd2, 0x58, 0xde, 0x29, 0xec, 0x56, 0x0e, 0x36, + 0x26, 0x0e, 0xe5, 0x52, 0xc8, 0x6c, 0xa5, 0x82, 0x9e, 0x42, 0xd1, 0xc7, 0x9c, 0x30, 0x7d, 0x2c, + 0x2b, 0xd2, 0x53, 0x50, 0x90, 0x3c, 0x15, 0x0c, 0xe8, 0x32, 0xe9, 0x05, 0x94, 0x9f, 0xc7, 0x1e, + 0x89, 0xcd, 0x91, 0x3c, 0x85, 0x05, 0xcc, 0x6e, 0xf4, 0xa9, 0x17, 0x53, 0x02, 0x76, 0xd3, 0x9d, + 0xb3, 0x85, 0x44, 0x28, 0xf4, 0xf4, 0x31, 0xe7, 0x14, 0xda, 0xd4, 0x13, 0x0a, 0x3d, 0xea, 0xb5, + 0xd7, 0x60, 0xc5, 0x23, 0x1c, 0x53, 0x9f, 0x59, 0x7f, 0x2f, 0x40, 0x7d, 0x8c, 0x43, 0xa7, 0xd7, + 0xd7, 0x50, 0xa6, 0xe1, 0x2d, 0xf6, 0xa9, 0xe7, 0x44, 0x42, 0xa0, 0xe9, 0x52, 0x7f, 0x4e, 0x95, + 0x50, 0x2e, 0xea, 0xce, 0xd9, 0x25, 0x9a, 0xfb, 0x46, 0x07, 0xb0, 0x81, 0x5d, 0x97, 0x0c, 0x39, + 0xd1, 0xab, 0x9d, 0x30, 0x12, 0x11, 0x96, 0x89, 0xd7, 0x9d, 0xb3, 0x91, 0x91, 0x4a, 0xf5, 0x33, + 0x21, 0xcb, 0xdb, 0x54, 0x87, 0x75, 0xd1, 0xc8, 0xa4, 0x30, 0xed, 0x6e, 0xaf, 0x00, 0xe5, 0x41, + 0x6d, 0xe6, 0x53, 0x58, 0xc4, 0xec, 0xc6, 0xdc, 0xe4, 0xf9, 0x60, 0xd8, 0x52, 0x20, 0x14, 0x7a, + 0xd4, 0x33, 0xd7, 0x50, 0x3e, 0x18, 0xb6, 0x14, 0x58, 0x5f, 0x02, 0x3a, 0x12, 0xc7, 0xec, 0x4f, + 0xc4, 0xb8, 0x98, 0x37, 0x5c, 0x25, 0x21, 0x44, 0xa9, 0xb9, 0xa2, 0x07, 0x8f, 0x2d, 0xd3, 0x79, + 0xfc, 0xd3, 0x3c, 0x2c, 0xa9, 0x18, 0x7c, 0xf8, 0x96, 0x90, 0x45, 0xd3, 0xa7, 0x23, 0xa2, 0x8e, + 0xaa, 0x6c, 0xaf, 0x09, 0xe4, 0x44, 0x00, 0xa8, 0x06, 0x0b, 0x38, 0xe0, 0x3a, 0x69, 0xc5, 0x4f, + 0xf4, 0x1b, 0xd8, 0x0e, 0xf0, 0xc8, 0xe9, 0x61, 0xee, 0x0e, 0x66, 0x4e, 0x16, 0x2a, 0x7d, 0x1f, + 0x04, 0x78, 0xd4, 0x16, 0x3a, 0x93, 0xc3, 0xc5, 0x84, 0x47, 0x4b, 0x93, 0x1e, 0xa1, 0xdd, 0xf1, + 0xcc, 0x45, 0x69, 0x51, 0x09, 0x95, 0xb1, 0xbc, 0xdd, 0x80, 0xa5, 0x24, 0xa4, 0x9c, 0xc9, 0x8c, + 0x2d, 0xdb, 0xea, 0x43, 0x94, 0x89, 0xfc, 0xe1, 0x24, 0x61, 0x3f, 0xf1, 0xfb, 0xd4, 0xf7, 0x89, + 0xd7, 0x58, 0x55, 0x65, 0x22, 0x05, 0x3f, 0x64, 0x38, 0xfa, 0x1c, 0x50, 0x4c, 0x18, 0x89, 0x6f, + 0x89, 0xe7, 0x64, 0x53, 0xc6, 0x9a, 0xaa, 0x40, 0x23, 0x79, 0xa5, 0xa7, 0x0d, 0x6b, 0x04, 0x0b, + 0x6d, 0xea, 0xa1, 0x9f, 0xa7, 0x29, 0xa2, 0xb3, 0xb1, 0x3c, 0x66, 0xa3, 0x6d, 0xa4, 0x62, 0x68, + 0x08, 0x68, 0xe8, 0x78, 0x89, 0xae, 0xd9, 0x9e, 0x1f, 0xb9, 0x37, 0x4c, 0x47, 0x79, 0x3d, 0xa0, + 0xe1, 0xb1, 0x96, 0xb4, 0xa5, 0x40, 0x4c, 0x28, 0xb7, 0x24, 0x66, 0x34, 0x0a, 0xd5, 0x40, 0x6a, + 0x9b, 0x4f, 0xc1, 0x7c, 0xc8, 0x6e, 0x3e, 0x8d, 0x19, 0x8f, 0xee, 0x65, 0xc6, 0xa3, 0x8f, 0x66, + 0x6e, 0xc0, 0x96, 0x4d, 0xdc, 0xe8, 0x96, 0xc4, 0x93, 0x73, 0xde, 0x39, 0x3c, 0x98, 0x92, 0xe8, + 0x72, 0xf8, 0x25, 0x6c, 0x85, 0x49, 0xe0, 0xc4, 0x4a, 0x4c, 0x3c, 0x27, 0x37, 0xf8, 0x89, 0xdd, + 0x37, 0xc2, 0x24, 0xb0, 0x8d, 0xd0, 0xac, 0x16, 0xf5, 0x76, 0xa8, 0x9e, 0x04, 0xd9, 0xc5, 0x6f, + 0x9d, 0x03, 0xca, 0x83, 0x9a, 0xe0, 0xd7, 0x50, 0x26, 0x23, 0xe2, 0x26, 0xd2, 0x39, 0x31, 0xd9, + 0x4c, 0x5c, 0x0b, 0x1d, 0x23, 0x14, 0x8b, 0x4a, 0x24, 0xf7, 0x65, 0x55, 0xa1, 0x7c, 0x15, 0xdd, + 0x90, 0x30, 0xf5, 0xe3, 0x6b, 0xa8, 0x18, 0x20, 0xed, 0x69, 0xcb, 0x5c, 0x22, 0xba, 0x9e, 0xd7, + 0xcd, 0xb6, 0x2f, 0x19, 0xe6, 0x52, 0xd7, 0xd6, 0x0a, 0xd6, 0x3f, 0xe6, 0x61, 0x2d, 0x45, 0x45, + 0x47, 0xef, 0x61, 0x46, 0x9c, 0x00, 0xbb, 0x38, 0x8e, 0xa2, 0x50, 0xd7, 0x5b, 0x49, 0x80, 0xdf, + 0x6b, 0x4c, 0xb4, 0xc1, 0x21, 0x7e, 0x1b, 0x90, 0x90, 0x3b, 0x03, 0xcc, 0x06, 0xa6, 0x0d, 0x6a, + 0xac, 0x8b, 0xd9, 0x00, 0xbd, 0x80, 0x9a, 0x51, 0x19, 0xc6, 0x84, 0x06, 0xf8, 0x5a, 0x35, 0x8e, + 0x92, 0x5d, 0xd5, 0xf8, 0x85, 0x86, 0xd1, 0x2e, 0xd4, 0x74, 0x9b, 0x1f, 0x62, 0xea, 0x39, 0x81, + 0xc8, 0x5f, 0x51, 0x82, 0x0b, 0x76, 0x45, 0xe1, 0x17, 0x98, 0x7a, 0xdf, 0x33, 0xcc, 0xd1, 0x17, + 0xb0, 0x19, 0x47, 0x09, 0xa7, 0xe1, 0xb5, 0xac, 0xdb, 0x4c, 0x7d, 0x49, 0xaa, 0x23, 0x2d, 0x3c, + 0x21, 0x24, 0x5d, 0xf2, 0x0c, 0x4a, 0x9c, 0x06, 0xc4, 0x71, 0x63, 0x82, 0x39, 0xf1, 0x64, 0x49, + 0x2e, 0xd8, 0x45, 0x81, 0x1d, 0x29, 0x48, 0x64, 0x8e, 0x6c, 0x3e, 0x44, 0x35, 0x8e, 0x55, 0xdb, + 0x7c, 0x8a, 0xc5, 0x8c, 0x47, 0x31, 0xbe, 0x26, 0x4e, 0x88, 0x03, 0x22, 0x6b, 0x70, 0xcd, 0x2e, + 0x6a, 0xec, 0x0c, 0x07, 0x64, 0xef, 0x5d, 0x01, 0x4a, 0xf9, 0x8e, 0x84, 0x6a, 0x50, 0xba, 0xe8, + 0x9c, 0x1d, 0x9f, 0x9e, 0x7d, 0xeb, 0x9c, 0x5f, 0x74, 0xce, 0x6a, 0x73, 0x08, 0x41, 0xc5, 0x20, + 0x3f, 0x5c, 0x1c, 0x1f, 0x5e, 0x75, 0x6a, 0x05, 0xb4, 0x0a, 0x8b, 0x52, 0x3a, 0x8f, 0x8a, 0xb0, + 0xd2, 0xf9, 0xf1, 0xe2, 0xd4, 0xee, 0x1c, 0xd7, 0x16, 0xf2, 0xaa, 0x47, 0x2f, 0xcf, 0x2f, 0x3b, + 0xc7, 0xb5, 0x45, 0x04, 0xb0, 0xac, 0x7f, 0x2f, 0xa1, 0x3a, 0x54, 0xed, 0xce, 0xd1, 0xf9, 0xab, + 0x8e, 0xfd, 0x3b, 0xe7, 0xe4, 0xf0, 0xf4, 0x65, 0xe7, 0xb8, 0xb6, 0x8c, 0xd6, 0xa1, 0x6c, 0x16, + 0xb5, 0x0f, 0xaf, 0x8e, 0xba, 0xb5, 0x95, 0x83, 0x7f, 0x16, 0x61, 0xf9, 0x4a, 0xde, 0x90, 0xc8, + 0x87, 0x52, 0xfe, 0x6d, 0x85, 0x1e, 0x99, 0x4c, 0x98, 0xf1, 0xb0, 0x6b, 0x3e, 0x9e, 0x2d, 0xd4, + 0x57, 0xf2, 0xb3, 0x3f, 0xff, 0xf4, 0x9f, 0x77, 0xf3, 0x8f, 0xac, 0xad, 0xd6, 0xed, 0x17, 0x2d, + 0xd7, 0x0f, 0x5a, 0xa6, 0x26, 0x5a, 0x6f, 0x84, 0xfa, 0x57, 0x85, 0x3d, 0xf4, 0x1a, 0x8a, 0xb9, + 0xe7, 0x2f, 0x6a, 0x66, 0x4d, 0x6e, 0x72, 0xf8, 0x6b, 0x4e, 0x4e, 0x59, 0xd6, 0x23, 0xb9, 0xfd, + 0xa6, 0x55, 0x9b, 0xdc, 0x5e, 0x6c, 0xec, 0x42, 0x29, 0xff, 0x24, 0xcb, 0xdc, 0x98, 0xf1, 0x7e, + 0xcb, 0xdc, 0x98, 0xf5, 0x8a, 0xb3, 0x1a, 0x92, 0x07, 0xa1, 0x29, 0x1e, 0x41, 0x92, 0x9f, 0xee, + 0x33, 0x92, 0x19, 0x6f, 0x97, 0x8c, 0x64, 0xd6, 0x83, 0xc0, 0x90, 0xec, 0x4d, 0x93, 0x8c, 0xa0, + 0x3a, 0x31, 0x79, 0xa3, 0xf4, 0x55, 0x32, 0xfb, 0x8d, 0xd0, 0x7c, 0x7a, 0xaf, 0x5c, 0xb3, 0xfd, + 0x9f, 0x64, 0x7b, 0x62, 0x3d, 0x9c, 0x3a, 0x19, 0x33, 0x89, 0x8b, 0x18, 0x72, 0xa8, 0x8c, 0x8f, + 0xc0, 0x68, 0xdb, 0x6c, 0x3c, 0x73, 0x3e, 0x6f, 0x3e, 0xb9, 0x4f, 0xac, 0x69, 0x9f, 0x4b, 0xda, + 0x6d, 0xab, 0x31, 0x45, 0xab, 0x27, 0x62, 0xc1, 0xfa, 0x06, 0x2a, 0xe3, 0xa3, 0x6a, 0xc6, 0x3a, + 0x73, 0x50, 0xce, 0x58, 0xef, 0x99, 0x70, 0x77, 0x24, 0x6b, 0xd3, 0xda, 0x9c, 0x62, 0xed, 0x25, + 0xc1, 0x50, 0x50, 0xde, 0x41, 0x75, 0xe2, 0x5e, 0xcf, 0x42, 0x3c, 0xbb, 0x15, 0x64, 0x21, 0xbe, + 0xa7, 0x21, 0xbc, 0xc7, 0x57, 0xdd, 0x23, 0x04, 0x31, 0x86, 0x62, 0x6e, 0x04, 0xcc, 0xd2, 0x7f, + 0x7a, 0xf6, 0x6c, 0x3e, 0x9a, 0x29, 0xd3, 0x64, 0x0f, 0x25, 0x59, 0xdd, 0xaa, 0x18, 0x32, 0x39, + 0x5d, 0xc8, 0x42, 0xf8, 0x03, 0x40, 0x36, 0xbd, 0xa1, 0x87, 0xf9, 0x4c, 0x1f, 0x1b, 0xf3, 0x9a, + 0xcd, 0x59, 0x22, 0xbd, 0xff, 0x96, 0xdc, 0xbf, 0x86, 0x26, 0xf6, 0x47, 0x3e, 0x14, 0x73, 0xb3, + 0x58, 0x66, 0xff, 0xf4, 0x5c, 0x97, 0xd9, 0x3f, 0x6b, 0x78, 0xd3, 0xf9, 0xb8, 0xf7, 0x78, 0x7c, + 0xff, 0xd6, 0x1f, 0x73, 0x83, 0xd3, 0x9f, 0xd0, 0x8f, 0x00, 0x59, 0x63, 0xcc, 0x5c, 0x99, 0xea, + 0xa0, 0x99, 0x2b, 0xd3, 0x7d, 0xd4, 0xaa, 0x4b, 0xaa, 0x32, 0x2a, 0x1a, 0xaa, 0x3e, 0x21, 0xc8, + 0x87, 0xb2, 0x1c, 0xdd, 0x2e, 0x43, 0x3c, 0x64, 0x83, 0x88, 0xa3, 0xb4, 0x58, 0xc7, 0x60, 0xb3, + 0xff, 0xf6, 0x3d, 0x52, 0x4d, 0xf1, 0x44, 0x52, 0x34, 0x50, 0x7a, 0xef, 0xc9, 0xd1, 0xb1, 0xc5, + 0xcc, 0xe6, 0xaf, 0xa1, 0xfc, 0x2d, 0xe1, 0x69, 0x0f, 0x65, 0x28, 0xfd, 0x7b, 0x62, 0xac, 0x4d, + 0x37, 0xb7, 0x26, 0x61, 0xbd, 0xff, 0x03, 0xb9, 0xff, 0x3a, 0xaa, 0x8a, 0xfd, 0x7d, 0x86, 0x79, + 0x4b, 0xb5, 0xe6, 0xf6, 0xff, 0xff, 0xfe, 0xf9, 0x35, 0xe5, 0x83, 0xa4, 0xb7, 0xef, 0x46, 0x41, + 0xcb, 0x17, 0xcf, 0xa2, 0x90, 0x86, 0xd7, 0x3e, 0xee, 0xb1, 0x96, 0xef, 0x07, 0x2d, 0xb5, 0x5d, + 0x6f, 0x59, 0xfe, 0xf7, 0xf8, 0x8b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x20, 0x35, 0x1d, 0x92, + 0xc3, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/clmrpc/trader.proto b/clmrpc/trader.proto index 3308dd5..099020c 100644 --- a/clmrpc/trader.proto +++ b/clmrpc/trader.proto @@ -473,6 +473,10 @@ message Order { or EXECUTED. */ uint32 units_unfulfilled = 8; + + // The value reserved from the account by this order to ensure the account + // can pay execution and chain fees in case it gets matched. + uint64 reserved_value_sat = 9; } message Bid { diff --git a/clmrpc/trader.swagger.json b/clmrpc/trader.swagger.json index 45aab5e..7cc6ea3 100644 --- a/clmrpc/trader.swagger.json +++ b/clmrpc/trader.swagger.json @@ -907,6 +907,11 @@ "type": "integer", "format": "int64", "description": "The number of currently unfilled units of this order. This will be equal to\nthe total amount of units until the order has reached the state PARTIAL_FILL\nor EXECUTED." + }, + "reserved_value_sat": { + "type": "string", + "format": "uint64", + "description": "The value reserved from the account by this order to ensure the account\ncan pay execution and chain fees in case it gets matched." } } }, diff --git a/rpcserver.go b/rpcserver.go index bf29115..9172bd8 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -22,6 +22,7 @@ import ( "github.com/lightninglabs/llm/clientdb" "github.com/lightninglabs/llm/clmrpc" "github.com/lightninglabs/llm/order" + "github.com/lightninglabs/llm/terms" "github.com/lightninglabs/lndclient" "github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/lnrpc" @@ -1127,6 +1128,16 @@ func (s *rpcServer) ListOrders(ctx context.Context, _ *clmrpc.ListOrdersRequest) return nil, err } + // If we cannot query the auctioneer, we just use an empty fee + // schedule, as it is only used for calculating the reserved value. + var feeSchedule terms.FeeSchedule = terms.NewLinearFeeSchedule(0, 0) + terms, err := s.auctioneer.Terms(ctx) + if err != nil { + log.Warnf("unable to query auctioneer terms: %v", err) + } else { + feeSchedule = terms.FeeSchedule() + } + // The RPC is split by order type so we have to separate them now. asks := make([]*clmrpc.Ask, 0, len(dbOrders)) bids := make([]*clmrpc.Bid, 0, len(dbOrders)) @@ -1174,6 +1185,9 @@ func (s *rpcServer) ListOrders(ctx context.Context, _ *clmrpc.ListOrdersRequest) State: orderState, Units: uint32(dbDetails.Units), UnitsUnfulfilled: uint32(dbDetails.UnitsUnfulfilled), + ReservedValueSat: uint64( + dbOrder.ReservedValue(feeSchedule), + ), } switch o := dbOrder.(type) {