diff --git a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go index cf5d9ad90..8bf6ff767 100644 --- a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go +++ b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go @@ -183,10 +183,8 @@ type Ics20Withdrawal struct { TimeoutHeight uint64 `protobuf:"varint,5,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height,omitempty"` // the timestamp at which this transfer expires. TimeoutTime uint64 `protobuf:"varint,6,opt,name=timeout_time,json=timeoutTime,proto3" json:"timeout_time,omitempty"` - // the source port that identifies the channel used for the withdrawal - SourcePort string `protobuf:"bytes,7,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"` // the source channel used for the withdrawal - SourceChannel string `protobuf:"bytes,8,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` + SourceChannel string `protobuf:"bytes,7,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` } func (m *Ics20Withdrawal) Reset() { *m = Ics20Withdrawal{} } @@ -264,13 +262,6 @@ func (m *Ics20Withdrawal) GetTimeoutTime() uint64 { return 0 } -func (m *Ics20Withdrawal) GetSourcePort() string { - if m != nil { - return m.SourcePort - } - return "" -} - func (m *Ics20Withdrawal) GetSourceChannel() string { if m != nil { return m.SourceChannel @@ -583,57 +574,56 @@ func init() { } var fileDescriptor_6509740287584c65 = []byte{ - // 791 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x41, 0x8f, 0x1b, 0x35, - 0x14, 0xc7, 0x77, 0x92, 0x74, 0x37, 0x71, 0x9a, 0x84, 0x8e, 0x2a, 0x3a, 0x0d, 0x22, 0x0d, 0xa3, - 0xb6, 0xda, 0x22, 0x31, 0x43, 0x52, 0x10, 0xd2, 0xa0, 0x4a, 0x64, 0xa7, 0xa2, 0xcc, 0xa1, 0x22, - 0x1a, 0xaa, 0x22, 0xa1, 0x48, 0x91, 0xc7, 0xe3, 0x26, 0x56, 0x33, 0x76, 0x64, 0x7b, 0xb2, 0x8a, - 0xf8, 0x12, 0x7c, 0x05, 0xb8, 0xc1, 0x99, 0x0f, 0x81, 0x38, 0xf5, 0xc8, 0x11, 0x65, 0x6f, 0x7c, - 0x0a, 0x64, 0x7b, 0x9c, 0xec, 0x4a, 0x2c, 0x7b, 0x8a, 0xdf, 0xff, 0xfd, 0xde, 0xcb, 0x7b, 0x6f, - 0x9e, 0x0d, 0x1e, 0xae, 0x31, 0x2d, 0x8b, 0x8c, 0xc3, 0x10, 0x31, 0x8e, 0x43, 0x92, 0xa1, 0x70, - 0x33, 0x82, 0xab, 0xf5, 0x12, 0x8e, 0x94, 0x11, 0xac, 0x39, 0x93, 0xcc, 0xed, 0x5b, 0x2a, 0x50, - 0x54, 0xa0, 0x1c, 0x96, 0xea, 0x7f, 0x7c, 0x35, 0x03, 0xe2, 0xdb, 0xb5, 0x64, 0x87, 0x24, 0xc6, - 0x36, 0x79, 0xfa, 0x0f, 0x54, 0x7e, 0x83, 0xad, 0x08, 0xa6, 0x32, 0xdc, 0x8c, 0xaa, 0x53, 0x05, - 0xdc, 0x5f, 0x30, 0xb6, 0x58, 0xe1, 0x50, 0x5b, 0x59, 0xf9, 0x26, 0x84, 0x74, 0x6b, 0x5c, 0xfe, - 0x57, 0xa0, 0x95, 0x64, 0x68, 0x82, 0x24, 0x61, 0xd4, 0x7d, 0x0a, 0x00, 0x87, 0xe7, 0x73, 0xa8, - 0x2d, 0xcf, 0x19, 0x3a, 0xa7, 0xed, 0xf1, 0xdd, 0xc0, 0x04, 0x07, 0x36, 0x38, 0x98, 0xd0, 0x6d, - 0xda, 0xe2, 0xf0, 0xdc, 0x04, 0xf9, 0x3f, 0x82, 0x7b, 0x5f, 0x97, 0x74, 0x41, 0xb2, 0x15, 0x7e, - 0xc5, 0xde, 0x62, 0x3a, 0x85, 0xe8, 0x2d, 0x96, 0xcf, 0xa1, 0x84, 0xee, 0x5d, 0x70, 0x2b, 0xc7, - 0x94, 0x15, 0x3a, 0x55, 0x2b, 0x35, 0x86, 0xfb, 0x3e, 0x38, 0x86, 0x05, 0x2b, 0xa9, 0xf4, 0x6a, - 0x5a, 0xae, 0x2c, 0xa5, 0x0b, 0x4c, 0x73, 0xcc, 0xbd, 0xba, 0xd1, 0x8d, 0xe5, 0xf6, 0x41, 0x93, - 0x63, 0x84, 0xc9, 0x06, 0x73, 0xaf, 0xa1, 0x3d, 0x7b, 0xdb, 0xff, 0xb5, 0x0e, 0x7a, 0x09, 0x12, - 0xe3, 0x4f, 0xbf, 0x27, 0x72, 0x99, 0x73, 0x78, 0x0e, 0x57, 0xee, 0xb3, 0x7d, 0x7e, 0xd3, 0xc1, - 0xa3, 0xe0, 0xea, 0x9c, 0xab, 0xd9, 0xd9, 0x59, 0x06, 0x13, 0x0d, 0xef, 0xcb, 0x88, 0x6c, 0xd1, - 0x35, 0x1d, 0xfd, 0xf0, 0x86, 0xe8, 0xe7, 0x8a, 0xb5, 0xad, 0x45, 0xe0, 0x7e, 0x8e, 0x85, 0x24, - 0x14, 0xaa, 0xd1, 0xcc, 0xd1, 0x12, 0x12, 0x3a, 0x87, 0x79, 0xce, 0xb1, 0x10, 0x55, 0x57, 0xf7, - 0x2e, 0x01, 0xb1, 0xf2, 0x4f, 0x8c, 0xdb, 0x7d, 0x09, 0xba, 0x1c, 0xcb, 0x92, 0x1f, 0x02, 0x1a, - 0xba, 0x80, 0xc7, 0x37, 0x95, 0x6f, 0xe8, 0xb4, 0x63, 0xa2, 0x6d, 0xba, 0x47, 0xa0, 0x2b, 0x49, - 0x81, 0x59, 0x29, 0xe7, 0x4b, 0x4c, 0x16, 0x4b, 0xe9, 0xdd, 0x1a, 0x3a, 0xa7, 0x8d, 0xb4, 0x53, - 0xa9, 0xdf, 0x68, 0xd1, 0xfd, 0x08, 0xdc, 0xb6, 0x98, 0xfa, 0xf5, 0x8e, 0x35, 0xd4, 0xae, 0xb4, - 0x57, 0xa4, 0xc0, 0xee, 0x03, 0xd0, 0x16, 0xac, 0xe4, 0x08, 0xcf, 0xd7, 0x8c, 0x4b, 0xef, 0x44, - 0xb7, 0x01, 0x8c, 0x34, 0x65, 0x5c, 0xaa, 0xbf, 0xaa, 0x00, 0xb4, 0x84, 0x94, 0xe2, 0x95, 0xd7, - 0xd4, 0x4c, 0xc7, 0xa8, 0xb1, 0x11, 0xfd, 0xdf, 0x1d, 0x00, 0x62, 0xbd, 0x96, 0x7a, 0x39, 0x3e, - 0x00, 0x2d, 0xb3, 0xa4, 0x73, 0x92, 0x57, 0x0b, 0xd2, 0x34, 0x42, 0x92, 0xbb, 0x5f, 0x80, 0xdb, - 0x95, 0x53, 0x48, 0x28, 0x71, 0xf5, 0x2d, 0xfe, 0x7b, 0x17, 0xdb, 0x86, 0xfc, 0x4e, 0x81, 0xaa, - 0x96, 0x35, 0x67, 0x08, 0x0b, 0x81, 0x73, 0xd3, 0x91, 0x19, 0x7b, 0x67, 0xaf, 0xea, 0x9e, 0x9e, - 0x80, 0xf7, 0x0e, 0x58, 0x35, 0x9f, 0x86, 0x6e, 0xbd, 0xb7, 0xd7, 0xcd, 0x84, 0xfc, 0x27, 0xa0, - 0x63, 0xaa, 0x8e, 0xd5, 0x7a, 0x60, 0xee, 0x7a, 0xe0, 0x04, 0x99, 0xa3, 0x2e, 0xbb, 0x91, 0x5a, - 0xd3, 0xff, 0x16, 0x74, 0x63, 0x46, 0x05, 0xa6, 0xa2, 0x14, 0xa6, 0x9c, 0x67, 0xa0, 0x87, 0xac, - 0x52, 0xb5, 0xf2, 0x7f, 0xd7, 0xaa, 0x8b, 0xae, 0x84, 0xfb, 0x2f, 0x40, 0xef, 0x35, 0xe6, 0xe4, - 0x0d, 0xb1, 0xd5, 0x08, 0xf7, 0x33, 0x70, 0x62, 0xea, 0x15, 0x9e, 0x33, 0xac, 0x9f, 0xb6, 0xc7, - 0x7d, 0xfd, 0x70, 0x98, 0xd5, 0x30, 0x97, 0x7e, 0x33, 0x0a, 0x0c, 0x9d, 0x5a, 0xd4, 0xff, 0x04, - 0xdc, 0x89, 0x19, 0xa5, 0x58, 0x5f, 0xd9, 0x9b, 0x1b, 0xf9, 0x1c, 0xdc, 0xb1, 0x3d, 0xdb, 0x20, - 0xe1, 0x0e, 0x41, 0x1b, 0x1d, 0x4c, 0xfd, 0xef, 0xad, 0xf4, 0xb2, 0x74, 0xf6, 0x73, 0xed, 0x8f, - 0xdd, 0xc0, 0x79, 0xb7, 0x1b, 0x38, 0x7f, 0xef, 0x06, 0xce, 0x4f, 0x17, 0x83, 0xa3, 0x77, 0x17, - 0x83, 0xa3, 0xbf, 0x2e, 0x06, 0x47, 0x60, 0x80, 0x58, 0x11, 0x5c, 0xff, 0xde, 0x9d, 0x35, 0x93, - 0x0c, 0x4d, 0xd5, 0x28, 0xa6, 0xce, 0x0f, 0xe9, 0x82, 0xc8, 0x65, 0x99, 0x05, 0x88, 0x15, 0x21, - 0x62, 0xa2, 0x60, 0x22, 0xe4, 0x78, 0x05, 0xb7, 0x98, 0x87, 0x9b, 0xf1, 0xfe, 0xa8, 0x2f, 0x97, - 0x08, 0xaf, 0x7f, 0x69, 0xbf, 0x24, 0x19, 0xb2, 0xe7, 0x5f, 0x6a, 0xf5, 0x69, 0x9c, 0xfc, 0x56, - 0xeb, 0x4f, 0x6d, 0x09, 0xb1, 0x2a, 0x21, 0xc9, 0x50, 0xf0, 0xba, 0x42, 0xfe, 0x3c, 0x38, 0x67, - 0xca, 0x39, 0x4b, 0x32, 0x34, 0xb3, 0xce, 0x5d, 0xed, 0xf1, 0xf5, 0xce, 0xd9, 0x8b, 0xe9, 0xd9, - 0x4b, 0x2c, 0x61, 0x0e, 0x25, 0xfc, 0xa7, 0xf6, 0xa1, 0x05, 0xa3, 0x48, 0x91, 0x51, 0x94, 0x64, - 0x28, 0x8a, 0x2c, 0x9b, 0x1d, 0xeb, 0x0f, 0xfe, 0xf4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, - 0xc7, 0x3e, 0x41, 0x23, 0x06, 0x00, 0x00, + // 773 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x41, 0x8f, 0x1b, 0x35, + 0x14, 0xde, 0x49, 0xd2, 0xdd, 0x8d, 0xd3, 0x24, 0x74, 0x54, 0xd1, 0x69, 0x10, 0x21, 0x8c, 0xda, + 0x6a, 0x8b, 0xc4, 0x0c, 0x49, 0x41, 0x48, 0x83, 0x2a, 0x91, 0x9d, 0x8a, 0x32, 0x87, 0x8a, 0x68, + 0xa8, 0x8a, 0x84, 0x22, 0x45, 0x1e, 0x8f, 0x9b, 0x58, 0x9b, 0xb1, 0x23, 0xdb, 0x93, 0x55, 0xc4, + 0x1f, 0xe0, 0xc8, 0x5f, 0x80, 0x23, 0x67, 0x7e, 0x04, 0xe2, 0xb4, 0x47, 0x8e, 0x28, 0x7b, 0xe3, + 0x57, 0x20, 0xdb, 0xe3, 0x64, 0x57, 0x62, 0xbb, 0xa7, 0xf8, 0x7d, 0xef, 0x7b, 0x2f, 0xdf, 0xf7, + 0xde, 0xd8, 0xe0, 0xd1, 0x0a, 0xd3, 0xb2, 0xc8, 0x38, 0x0c, 0x11, 0xe3, 0x38, 0x24, 0x19, 0x0a, + 0xd7, 0x43, 0xb8, 0x5c, 0x2d, 0xe0, 0x50, 0x05, 0xc1, 0x8a, 0x33, 0xc9, 0xdc, 0x9e, 0x65, 0x05, + 0x8a, 0x15, 0xa8, 0x84, 0x65, 0xf5, 0x3e, 0xb9, 0xde, 0x01, 0xf1, 0xcd, 0x4a, 0xb2, 0x7d, 0x13, + 0x13, 0x9b, 0x3e, 0xbd, 0x8f, 0x54, 0x7f, 0x43, 0x5b, 0x12, 0x4c, 0x65, 0xb8, 0x1e, 0x56, 0xa7, + 0x8a, 0xf0, 0x70, 0xce, 0xd8, 0x7c, 0x89, 0x43, 0x1d, 0x65, 0xe5, 0xdb, 0x10, 0xd2, 0x8d, 0x49, + 0xf9, 0x5f, 0x83, 0x66, 0x92, 0xa1, 0x31, 0x92, 0x84, 0x51, 0xf7, 0x19, 0x00, 0x1c, 0x9e, 0xcf, + 0xa0, 0x8e, 0x3c, 0x67, 0xe0, 0x9c, 0xb4, 0x46, 0xf7, 0x03, 0x53, 0x1c, 0xd8, 0xe2, 0x60, 0x4c, + 0x37, 0x69, 0x93, 0xc3, 0x73, 0x53, 0xe4, 0xff, 0x04, 0x1e, 0x7c, 0x53, 0xd2, 0x39, 0xc9, 0x96, + 0xf8, 0x35, 0x3b, 0xc3, 0x74, 0x02, 0xd1, 0x19, 0x96, 0x2f, 0xa0, 0x84, 0xee, 0x7d, 0x70, 0x27, + 0xc7, 0x94, 0x15, 0xba, 0x55, 0x33, 0x35, 0x81, 0xfb, 0x3e, 0x38, 0x84, 0x05, 0x2b, 0xa9, 0xf4, + 0x6a, 0x1a, 0xae, 0x22, 0x85, 0x0b, 0x4c, 0x73, 0xcc, 0xbd, 0xba, 0xc1, 0x4d, 0xe4, 0xf6, 0xc0, + 0x31, 0xc7, 0x08, 0x93, 0x35, 0xe6, 0x5e, 0x43, 0x67, 0x76, 0xb1, 0xff, 0x73, 0x1d, 0x74, 0x13, + 0x24, 0x46, 0x9f, 0xfd, 0x40, 0xe4, 0x22, 0xe7, 0xf0, 0x1c, 0x2e, 0xdd, 0xe7, 0xbb, 0xfe, 0xc6, + 0xc1, 0xe3, 0xe0, 0xfa, 0x9c, 0xab, 0xd9, 0xd9, 0x59, 0x06, 0x63, 0x4d, 0xde, 0xc9, 0x88, 0xac, + 0xe8, 0x9a, 0xae, 0x7e, 0x74, 0x4b, 0xf5, 0x0b, 0xc5, 0xb5, 0xd6, 0x22, 0xf0, 0x30, 0xc7, 0x42, + 0x12, 0x0a, 0xd5, 0x68, 0x66, 0x68, 0x01, 0x09, 0x9d, 0xc1, 0x3c, 0xe7, 0x58, 0x88, 0xca, 0xd5, + 0x83, 0x2b, 0x84, 0x58, 0xe5, 0xc7, 0x26, 0xed, 0xbe, 0x02, 0x1d, 0x8e, 0x65, 0xc9, 0xf7, 0x05, + 0x0d, 0x2d, 0xe0, 0xc9, 0x6d, 0xf2, 0x0d, 0x3b, 0x6d, 0x9b, 0x6a, 0xdb, 0xee, 0x31, 0xe8, 0x48, + 0x52, 0x60, 0x56, 0xca, 0xd9, 0x02, 0x93, 0xf9, 0x42, 0x7a, 0x77, 0x06, 0xce, 0x49, 0x23, 0x6d, + 0x57, 0xe8, 0xb7, 0x1a, 0x74, 0x3f, 0x06, 0x77, 0x2d, 0x4d, 0xfd, 0x7a, 0x87, 0x9a, 0xd4, 0xaa, + 0xb0, 0xd7, 0xa4, 0xc0, 0xaa, 0x93, 0x60, 0x25, 0x47, 0x58, 0xf9, 0xa1, 0x14, 0x2f, 0xbd, 0x23, + 0xed, 0xa4, 0x6d, 0xd0, 0xd8, 0x80, 0xfe, 0x1f, 0x0e, 0x00, 0xb1, 0xfe, 0xea, 0xf4, 0xee, 0x3f, + 0x00, 0x4d, 0xf3, 0x0d, 0xce, 0x48, 0x5e, 0xed, 0xff, 0xd8, 0x00, 0x49, 0xee, 0x7e, 0x09, 0xee, + 0x56, 0x49, 0x21, 0xa1, 0xc4, 0xd5, 0xa8, 0xff, 0xff, 0x53, 0x6b, 0x19, 0xe6, 0xf7, 0x8a, 0xa8, + 0xb4, 0xac, 0x38, 0x43, 0x58, 0x08, 0x9c, 0x1b, 0xc1, 0x66, 0xaa, 0xed, 0x1d, 0xaa, 0x25, 0x3f, + 0x05, 0xef, 0xed, 0x69, 0x95, 0xfd, 0x86, 0x76, 0xd6, 0xdd, 0xe1, 0x66, 0x00, 0xfe, 0x53, 0xd0, + 0x36, 0xaa, 0x63, 0xb5, 0x7d, 0xcc, 0x5d, 0x0f, 0x1c, 0x21, 0x73, 0xd4, 0xb2, 0x1b, 0xa9, 0x0d, + 0xfd, 0xef, 0x40, 0x27, 0x66, 0x54, 0x60, 0x2a, 0x4a, 0x61, 0xe4, 0x3c, 0x07, 0x5d, 0x64, 0x91, + 0xca, 0xca, 0xbb, 0x6e, 0x4d, 0x07, 0x5d, 0x2b, 0xf7, 0x5f, 0x82, 0xee, 0x1b, 0xcc, 0xc9, 0x5b, + 0x62, 0xd5, 0x08, 0xf7, 0x73, 0x70, 0x64, 0xf4, 0x0a, 0xcf, 0x19, 0xd4, 0x4f, 0x5a, 0xa3, 0x9e, + 0x7e, 0x17, 0xcc, 0xe6, 0xcd, 0x9d, 0x5e, 0x0f, 0x03, 0xc3, 0x4e, 0x2d, 0xd5, 0xff, 0x14, 0xdc, + 0x8b, 0x19, 0xa5, 0x58, 0xdf, 0xc8, 0xdb, 0x8d, 0x7c, 0x01, 0xee, 0x59, 0xcf, 0xb6, 0x48, 0xb8, + 0x03, 0xd0, 0x42, 0xfb, 0x50, 0xff, 0x7b, 0x33, 0xbd, 0x0a, 0x9d, 0xfe, 0x5a, 0xfb, 0x73, 0xdb, + 0x77, 0x2e, 0xb6, 0x7d, 0xe7, 0x9f, 0x6d, 0xdf, 0xf9, 0xe5, 0xb2, 0x7f, 0x70, 0x71, 0xd9, 0x3f, + 0xf8, 0xfb, 0xb2, 0x7f, 0x00, 0xfa, 0x88, 0x15, 0xc1, 0xcd, 0xcf, 0xd9, 0xe9, 0x71, 0x92, 0xa1, + 0x89, 0x1a, 0xc5, 0xc4, 0xf9, 0x31, 0x9d, 0x13, 0xb9, 0x28, 0xb3, 0x00, 0xb1, 0x22, 0x44, 0x4c, + 0x14, 0x4c, 0x84, 0x1c, 0x2f, 0xe1, 0x06, 0xf3, 0x70, 0x3d, 0xda, 0x1d, 0xf5, 0xdd, 0x11, 0xe1, + 0xcd, 0x0f, 0xe9, 0x57, 0x24, 0x43, 0xf6, 0xfc, 0x5b, 0xad, 0x3e, 0x89, 0x93, 0xdf, 0x6b, 0xbd, + 0x89, 0x95, 0x10, 0x2b, 0x09, 0x49, 0x86, 0x82, 0x37, 0x15, 0xe5, 0xaf, 0x7d, 0x72, 0xaa, 0x92, + 0xd3, 0x24, 0x43, 0x53, 0x9b, 0xdc, 0xd6, 0x9e, 0xdc, 0x9c, 0x9c, 0xbe, 0x9c, 0x9c, 0xbe, 0xc2, + 0x12, 0xe6, 0x50, 0xc2, 0x7f, 0x6b, 0x1f, 0x5a, 0x62, 0x14, 0x29, 0x66, 0x14, 0x25, 0x19, 0x8a, + 0x22, 0xcb, 0xcd, 0x0e, 0xf5, 0xc2, 0x9f, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x2a, 0x21, + 0xe0, 0x02, 0x06, 0x00, 0x00, } func (m *IbcAction) Marshal() (dAtA []byte, err error) { @@ -747,13 +737,6 @@ func (m *Ics20Withdrawal) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.SourceChannel) i = encodeVarintIbc(dAtA, i, uint64(len(m.SourceChannel))) i-- - dAtA[i] = 0x42 - } - if len(m.SourcePort) > 0 { - i -= len(m.SourcePort) - copy(dAtA[i:], m.SourcePort) - i = encodeVarintIbc(dAtA, i, uint64(len(m.SourcePort))) - i-- dAtA[i] = 0x3a } if m.TimeoutTime != 0 { @@ -1103,10 +1086,6 @@ func (m *Ics20Withdrawal) Size() (n int) { if m.TimeoutTime != 0 { n += 1 + sovIbc(uint64(m.TimeoutTime)) } - l = len(m.SourcePort) - if l > 0 { - n += 1 + l + sovIbc(uint64(l)) - } l = len(m.SourceChannel) if l > 0 { n += 1 + l + sovIbc(uint64(l)) @@ -1683,38 +1662,6 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { } } case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SourcePort", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowIbc - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthIbc - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthIbc - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SourcePort = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", wireType) } diff --git a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go index bb0efd7c7..c22d6f2ae 100644 --- a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go +++ b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go @@ -2500,14 +2500,20 @@ func (m *WitnessData) GetStateCommitmentProofs() []*v1alpha1.StateCommitmentProo return nil } -// Describes a planned transaction. +// Describes a planned transaction. Permits clients to prepare a transaction +// prior submission, so that a user can review it prior to authorizing its execution. type TransactionPlan struct { - Actions []*ActionPlan `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` - ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` - CluePlans []*CluePlan `protobuf:"bytes,5,rep,name=clue_plans,json=cluePlans,proto3" json:"clue_plans,omitempty"` - MemoPlan *MemoPlan `protobuf:"bytes,6,opt,name=memo_plan,json=memoPlan,proto3" json:"memo_plan,omitempty"` + // The planner interface(s) for Actions to be performed, such as a Spend, Swap, + // or Delegation. See the ActionPlan docs for a full list of options. + Actions []*ActionPlan `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + // Time, as block height, after which TransactionPlan should be considered invalid. + ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` + // The name of the network for which this TransactionPlan was built. + ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` + CluePlans []*CluePlan `protobuf:"bytes,5,rep,name=clue_plans,json=cluePlans,proto3" json:"clue_plans,omitempty"` + // Planning interface for constructing an optional Memo for the Transaction. + MemoPlan *MemoPlan `protobuf:"bytes,6,opt,name=memo_plan,json=memoPlan,proto3" json:"memo_plan,omitempty"` } func (m *TransactionPlan) Reset() { *m = TransactionPlan{} } diff --git a/relayer/chains/penumbra/view/v1alpha1/view.pb.go b/relayer/chains/penumbra/view/v1alpha1/view.pb.go index 603de4d9b..35056567e 100644 --- a/relayer/chains/penumbra/view/v1alpha1/view.pb.go +++ b/relayer/chains/penumbra/view/v1alpha1/view.pb.go @@ -247,13 +247,14 @@ type TransactionPlannerRequest struct { // The fee for the requested TransactionPlan, if any. Fee *v1alpha11.Fee `protobuf:"bytes,2,opt,name=fee,proto3" json:"fee,omitempty"` // The memo for the requested TransactionPlan - Memo string `protobuf:"bytes,3,opt,name=memo,proto3" json:"memo,omitempty"` + Memo *v1alpha1.MemoPlaintext `protobuf:"bytes,3,opt,name=memo,proto3" json:"memo,omitempty"` // Types that are valid to be assigned to XAccountGroupId: // *TransactionPlannerRequest_AccountGroupId XAccountGroupId isTransactionPlannerRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` // Request contents Outputs []*TransactionPlannerRequest_Output `protobuf:"bytes,20,rep,name=outputs,proto3" json:"outputs,omitempty"` Swaps []*TransactionPlannerRequest_Swap `protobuf:"bytes,30,rep,name=swaps,proto3" json:"swaps,omitempty"` + SwapClaims []*TransactionPlannerRequest_SwapClaim `protobuf:"bytes,31,rep,name=swap_claims,json=swapClaims,proto3" json:"swap_claims,omitempty"` Delegations []*TransactionPlannerRequest_Delegate `protobuf:"bytes,40,rep,name=delegations,proto3" json:"delegations,omitempty"` Undelegations []*TransactionPlannerRequest_Undelegate `protobuf:"bytes,50,rep,name=undelegations,proto3" json:"undelegations,omitempty"` IbcActions []*v1alpha12.IbcAction `protobuf:"bytes,60,rep,name=ibc_actions,json=ibcActions,proto3" json:"ibc_actions,omitempty"` @@ -325,11 +326,11 @@ func (m *TransactionPlannerRequest) GetFee() *v1alpha11.Fee { return nil } -func (m *TransactionPlannerRequest) GetMemo() string { +func (m *TransactionPlannerRequest) GetMemo() *v1alpha1.MemoPlaintext { if m != nil { return m.Memo } - return "" + return nil } func (m *TransactionPlannerRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { @@ -353,6 +354,13 @@ func (m *TransactionPlannerRequest) GetSwaps() []*TransactionPlannerRequest_Swap return nil } +func (m *TransactionPlannerRequest) GetSwapClaims() []*TransactionPlannerRequest_SwapClaim { + if m != nil { + return m.SwapClaims + } + return nil +} + func (m *TransactionPlannerRequest) GetDelegations() []*TransactionPlannerRequest_Delegate { if m != nil { return m.Delegations @@ -383,7 +391,9 @@ func (*TransactionPlannerRequest) XXX_OneofWrappers() []interface{} { // Request message subtypes type TransactionPlannerRequest_Output struct { - Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + // The amount and denomination in which the Output is issued. + Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + // The address to which Output will be sent. Address *v1alpha11.Address `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` } @@ -435,9 +445,12 @@ func (m *TransactionPlannerRequest_Output) GetAddress() *v1alpha11.Address { } type TransactionPlannerRequest_Swap struct { - Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + // The amount and denomination to be traded in the Swap. + Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` + // The denomination to be received as a Output of the Swap. TargetAsset *v1alpha11.AssetId `protobuf:"bytes,2,opt,name=target_asset,json=targetAsset,proto3" json:"target_asset,omitempty"` - Fee *v1alpha11.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` + // An optional fee to be paid for performing the Swap. + Fee *v1alpha11.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` } func (m *TransactionPlannerRequest_Swap) Reset() { *m = TransactionPlannerRequest_Swap{} } @@ -494,6 +507,53 @@ func (m *TransactionPlannerRequest_Swap) GetFee() *v1alpha11.Fee { return nil } +type TransactionPlannerRequest_SwapClaim struct { + // SwapCommitment to identify the Swap to be claimed. + // Use the commitment from the Swap message: + // penumbra.core.dex.v1alpha1.Swap.body.payload.commitment. + SwapCommitment *v1alpha11.StateCommitment `protobuf:"bytes,1,opt,name=swap_commitment,json=swapCommitment,proto3" json:"swap_commitment,omitempty"` +} + +func (m *TransactionPlannerRequest_SwapClaim) Reset() { *m = TransactionPlannerRequest_SwapClaim{} } +func (m *TransactionPlannerRequest_SwapClaim) String() string { return proto.CompactTextString(m) } +func (*TransactionPlannerRequest_SwapClaim) ProtoMessage() {} +func (*TransactionPlannerRequest_SwapClaim) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{4, 2} +} +func (m *TransactionPlannerRequest_SwapClaim) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TransactionPlannerRequest_SwapClaim) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TransactionPlannerRequest_SwapClaim.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TransactionPlannerRequest_SwapClaim) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionPlannerRequest_SwapClaim.Merge(m, src) +} +func (m *TransactionPlannerRequest_SwapClaim) XXX_Size() int { + return m.Size() +} +func (m *TransactionPlannerRequest_SwapClaim) XXX_DiscardUnknown() { + xxx_messageInfo_TransactionPlannerRequest_SwapClaim.DiscardUnknown(m) +} + +var xxx_messageInfo_TransactionPlannerRequest_SwapClaim proto.InternalMessageInfo + +func (m *TransactionPlannerRequest_SwapClaim) GetSwapCommitment() *v1alpha11.StateCommitment { + if m != nil { + return m.SwapCommitment + } + return nil +} + type TransactionPlannerRequest_Delegate struct { Amount *v1alpha11.Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` RateData *v1alpha13.RateData `protobuf:"bytes,3,opt,name=rate_data,json=rateData,proto3" json:"rate_data,omitempty"` @@ -503,7 +563,7 @@ func (m *TransactionPlannerRequest_Delegate) Reset() { *m = TransactionP func (m *TransactionPlannerRequest_Delegate) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Delegate) ProtoMessage() {} func (*TransactionPlannerRequest_Delegate) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 2} + return fileDescriptor_0aa947b204e6a7c2, []int{4, 3} } func (m *TransactionPlannerRequest_Delegate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -555,7 +615,7 @@ func (m *TransactionPlannerRequest_Undelegate) Reset() { *m = Transactio func (m *TransactionPlannerRequest_Undelegate) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Undelegate) ProtoMessage() {} func (*TransactionPlannerRequest_Undelegate) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 3} + return fileDescriptor_0aa947b204e6a7c2, []int{4, 4} } func (m *TransactionPlannerRequest_Undelegate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3425,6 +3485,7 @@ func init() { proto.RegisterType((*TransactionPlannerRequest)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest") proto.RegisterType((*TransactionPlannerRequest_Output)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Output") proto.RegisterType((*TransactionPlannerRequest_Swap)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Swap") + proto.RegisterType((*TransactionPlannerRequest_SwapClaim)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.SwapClaim") proto.RegisterType((*TransactionPlannerRequest_Delegate)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Delegate") proto.RegisterType((*TransactionPlannerRequest_Undelegate)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Undelegate") proto.RegisterType((*TransactionPlannerResponse)(nil), "penumbra.view.v1alpha1.TransactionPlannerResponse") @@ -3477,192 +3538,195 @@ func init() { func init() { proto.RegisterFile("penumbra/view/v1alpha1/view.proto", fileDescriptor_0aa947b204e6a7c2) } var fileDescriptor_0aa947b204e6a7c2 = []byte{ - // 2954 bytes of a gzipped FileDescriptorProto + // 3002 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5b, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xf7, 0x92, 0xfa, 0xf2, 0xa3, 0x48, 0xca, 0x6b, 0x5b, 0xa2, 0x99, 0x44, 0x49, 0x37, 0xb1, - 0xad, 0x38, 0x09, 0x65, 0x2b, 0x4e, 0x9a, 0x2a, 0x49, 0x1b, 0xd1, 0x8a, 0x2c, 0xc1, 0xb1, 0xad, - 0xae, 0x6c, 0xa5, 0x49, 0x95, 0x2e, 0x46, 0xbb, 0x23, 0x69, 0x2b, 0x72, 0x77, 0xb3, 0x3b, 0x14, - 0xc5, 0xf6, 0x94, 0x22, 0x28, 0x8c, 0x00, 0x0d, 0x8a, 0xa2, 0x97, 0x5c, 0x7b, 0x2c, 0x7a, 0xcd, - 0xb5, 0x28, 0xd0, 0x4b, 0xd1, 0x53, 0x8e, 0x05, 0x0a, 0x14, 0x81, 0x83, 0x5e, 0xda, 0x7f, 0xa1, - 0x40, 0x8b, 0xf9, 0x5a, 0xee, 0x2e, 0x77, 0x4d, 0x52, 0x92, 0xe1, 0xb6, 0x27, 0x71, 0x66, 0xde, - 0xfb, 0xbd, 0x8f, 0x99, 0x79, 0xf3, 0xe6, 0xcd, 0x0a, 0xbe, 0xe5, 0x61, 0xa7, 0xd5, 0xdc, 0xf6, - 0xd1, 0xfc, 0x81, 0x8d, 0xdb, 0xf3, 0x07, 0xd7, 0x50, 0xc3, 0xdb, 0x43, 0xd7, 0x58, 0xab, 0xe6, - 0xf9, 0x2e, 0x71, 0xd5, 0x69, 0x49, 0x52, 0x63, 0x9d, 0x92, 0xa4, 0x3a, 0x17, 0xb2, 0x9a, 0xae, - 0x8f, 0xe7, 0xcd, 0x3d, 0x64, 0x3b, 0x5d, 0x00, 0xd6, 0xe4, 0x08, 0xd5, 0x2b, 0x09, 0x4a, 0xbf, - 0xe3, 0x11, 0x37, 0x42, 0xca, 0xda, 0x82, 0xf6, 0x85, 0x38, 0xad, 0x85, 0x0f, 0xbb, 0x84, 0x16, - 0x3e, 0x14, 0x54, 0xd7, 0xe3, 0x54, 0xc4, 0x47, 0x4e, 0x80, 0x4c, 0x62, 0xbb, 0x11, 0x0d, 0x22, - 0x9d, 0xe9, 0xd8, 0xf6, 0xb6, 0xd9, 0xa5, 0xb6, 0xb7, 0x4d, 0x41, 0x95, 0xb0, 0x2b, 0x20, 0x68, - 0x1f, 0x77, 0xe9, 0x58, 0x93, 0x53, 0x6a, 0x5f, 0x2b, 0x50, 0x59, 0x6a, 0x91, 0x3d, 0xd7, 0xb7, - 0x7f, 0x82, 0x97, 0x1c, 0xab, 0xde, 0xb2, 0x1b, 0x96, 0x8e, 0x3f, 0x6e, 0xe1, 0x80, 0xa8, 0x3f, - 0x82, 0xa9, 0x88, 0x06, 0x86, 0xd7, 0x40, 0x4e, 0x45, 0x79, 0x4e, 0x99, 0x2b, 0x2c, 0xbc, 0x5a, - 0x0b, 0x3d, 0x4a, 0x25, 0xd4, 0xa2, 0x8a, 0x4a, 0x39, 0xb5, 0x7b, 0xdd, 0xce, 0xf5, 0x06, 0x72, - 0xf4, 0x32, 0x89, 0x77, 0xa8, 0x16, 0xa8, 0x48, 0xc8, 0x46, 0x4c, 0x82, 0x85, 0x08, 0xaa, 0xe4, - 0x98, 0x84, 0xd7, 0x06, 0x91, 0xb0, 0x14, 0xe5, 0x5e, 0x46, 0x04, 0xe9, 0x67, 0x50, 0xb2, 0x4b, - 0x73, 0xe0, 0x42, 0x8a, 0x85, 0x81, 0xe7, 0x3a, 0x01, 0x56, 0xbf, 0x0f, 0x85, 0x08, 0xb2, 0xb0, - 0x6e, 0x7e, 0x48, 0xeb, 0xf4, 0x28, 0x86, 0xf6, 0x85, 0x02, 0x4f, 0xd5, 0x7d, 0x17, 0x59, 0x26, - 0x0a, 0x48, 0x94, 0x4a, 0x78, 0xf5, 0xe4, 0x45, 0xaa, 0x97, 0xa1, 0x8c, 0xda, 0xc8, 0x26, 0x86, - 0x85, 0x09, 0xe6, 0xb0, 0xd4, 0x8b, 0x13, 0x7a, 0x89, 0x75, 0x2f, 0xcb, 0x5e, 0xed, 0x13, 0x05, - 0x9e, 0x4e, 0xd7, 0x4d, 0xf8, 0xe3, 0x75, 0xc8, 0xd9, 0x96, 0xd0, 0xe9, 0xd2, 0x20, 0x3a, 0xad, - 0x59, 0x7a, 0xce, 0xb6, 0xd4, 0x17, 0x61, 0x2a, 0x94, 0x6d, 0xec, 0x61, 0x7b, 0x77, 0x8f, 0x30, - 0x15, 0x46, 0xf4, 0x72, 0xd8, 0xbf, 0xca, 0xba, 0xb5, 0x2f, 0x00, 0x2e, 0x24, 0x96, 0x86, 0x83, - 0x7d, 0xe9, 0x9d, 0xe7, 0xa1, 0x88, 0x0f, 0x3d, 0xdb, 0xef, 0x48, 0x14, 0x85, 0xa1, 0x4c, 0xf2, - 0x4e, 0x0e, 0xa1, 0x5e, 0x87, 0xfc, 0x0e, 0xc6, 0x62, 0xa5, 0x68, 0x09, 0x35, 0xc5, 0x5e, 0x0c, - 0x35, 0x5c, 0xc1, 0x58, 0xa7, 0xe4, 0xaa, 0x0a, 0x23, 0x4d, 0xdc, 0x74, 0x2b, 0xf9, 0xe7, 0x94, - 0xb9, 0xd3, 0x3a, 0xfb, 0xad, 0x6e, 0xc1, 0x14, 0x32, 0x4d, 0xb7, 0xe5, 0x10, 0x63, 0xd7, 0x77, - 0x5b, 0x9e, 0x61, 0x5b, 0x95, 0x12, 0x83, 0x7d, 0xa5, 0x0f, 0xec, 0x12, 0x67, 0xbb, 0x49, 0xb9, - 0xd6, 0xac, 0xd5, 0x53, 0x7a, 0x09, 0xc5, 0x7a, 0x1e, 0x28, 0x8a, 0xaa, 0xc3, 0xb8, 0xdb, 0x22, - 0x5e, 0x8b, 0x04, 0x95, 0x73, 0xcf, 0xe5, 0xe7, 0x0a, 0x0b, 0x6f, 0xd4, 0xd2, 0x23, 0x51, 0x2d, - 0xd3, 0x21, 0xb5, 0xbb, 0x0c, 0x40, 0x97, 0x40, 0xea, 0x7b, 0x30, 0x1a, 0xb4, 0x91, 0x17, 0x54, - 0x66, 0x19, 0xe2, 0xeb, 0xc3, 0x23, 0x6e, 0xb4, 0x91, 0xa7, 0x73, 0x10, 0x75, 0x0b, 0x0a, 0x16, - 0x6e, 0xe0, 0x5d, 0xb6, 0x5d, 0x82, 0xca, 0x1c, 0xc3, 0x5c, 0x1c, 0x1e, 0x73, 0x99, 0x83, 0x60, - 0x3d, 0x0a, 0xa7, 0x6e, 0x43, 0xb1, 0xe5, 0x44, 0xf1, 0x17, 0x18, 0xfe, 0x5b, 0xc3, 0xe3, 0xdf, - 0x97, 0x30, 0x58, 0x8f, 0x43, 0xaa, 0x2b, 0x50, 0xb0, 0xb7, 0x4d, 0x83, 0x73, 0x05, 0x95, 0xb7, - 0x98, 0x84, 0x8b, 0x89, 0xc9, 0xa3, 0xa1, 0xb1, 0xbb, 0x64, 0xb7, 0xcd, 0x25, 0xbe, 0xea, 0xc1, - 0x96, 0x3f, 0x83, 0xea, 0xcf, 0x15, 0x18, 0xe3, 0xbe, 0x56, 0x17, 0x61, 0xf4, 0x00, 0x35, 0x5a, - 0x58, 0xec, 0x83, 0x17, 0xfa, 0xac, 0x84, 0x4d, 0x4a, 0xab, 0x73, 0x16, 0xf5, 0x1d, 0x18, 0x47, - 0x96, 0xe5, 0xe3, 0x20, 0x10, 0xcb, 0xf3, 0x52, 0xbf, 0x75, 0xc4, 0xa9, 0x75, 0xc9, 0x56, 0xfd, - 0xa3, 0x02, 0x23, 0x74, 0x8a, 0x8e, 0xa5, 0xc6, 0x1a, 0x4c, 0x12, 0xe4, 0xef, 0x62, 0x62, 0xa0, - 0x20, 0xc0, 0x64, 0x50, 0x5d, 0x28, 0xed, 0x9a, 0xa5, 0x17, 0x38, 0x2f, 0x6b, 0xca, 0xcd, 0x96, - 0x1f, 0x6a, 0xb3, 0x55, 0x3f, 0x57, 0x60, 0x42, 0x2e, 0x0a, 0xf5, 0x6d, 0x18, 0x43, 0x4d, 0xba, - 0x37, 0x84, 0x29, 0x17, 0xfb, 0xe9, 0xc1, 0x88, 0x75, 0xc1, 0xa4, 0xde, 0x80, 0xd3, 0x3e, 0x22, - 0x98, 0x1f, 0x0f, 0xf9, 0x54, 0x4b, 0xf8, 0x99, 0x16, 0x02, 0xe8, 0x88, 0x60, 0x76, 0x1e, 0x4c, - 0xf8, 0xe2, 0x57, 0xf5, 0x17, 0x0a, 0x40, 0x77, 0x15, 0x1d, 0xcb, 0xb9, 0x31, 0x7d, 0x72, 0x47, - 0xd3, 0xa7, 0x7e, 0x16, 0xce, 0x18, 0xc9, 0xd0, 0xa3, 0x61, 0xa8, 0xa6, 0xed, 0x01, 0x11, 0x9c, - 0x6f, 0xc2, 0xc8, 0x71, 0xcf, 0x60, 0x06, 0xa0, 0xfd, 0x4a, 0x81, 0xf3, 0x62, 0xdd, 0xd5, 0x3b, - 0x6b, 0x8e, 0x85, 0x0f, 0x65, 0xf8, 0x5d, 0x87, 0xa2, 0x58, 0x87, 0x86, 0x4d, 0xfb, 0x85, 0xac, - 0x97, 0x06, 0x5b, 0xc4, 0x1c, 0x6a, 0x12, 0x45, 0x5a, 0xf4, 0x6c, 0xb2, 0xec, 0xc0, 0x6b, 0xa0, - 0x8e, 0x61, 0xba, 0xce, 0x8e, 0xed, 0x37, 0xe5, 0xd9, 0x24, 0xba, 0x6f, 0xf0, 0x5e, 0xed, 0x43, - 0x98, 0x4e, 0xea, 0x24, 0xec, 0x8e, 0xec, 0x29, 0xe5, 0x48, 0x7b, 0x4a, 0xfb, 0x00, 0xce, 0x33, - 0xc8, 0x7a, 0x47, 0x0e, 0x09, 0x7b, 0x8f, 0x0f, 0xfd, 0x89, 0x02, 0xd3, 0x49, 0x6c, 0xa1, 0xf7, - 0xfd, 0xe3, 0x3b, 0x73, 0xf5, 0x54, 0xdc, 0x9d, 0x0f, 0x14, 0xa5, 0x3e, 0x05, 0x25, 0x23, 0x86, - 0xab, 0xfd, 0x5a, 0x81, 0x99, 0x77, 0xbd, 0x3d, 0xdc, 0xc4, 0x3e, 0x6a, 0x24, 0x2c, 0x7c, 0x82, - 0x33, 0xba, 0x05, 0x95, 0x5e, 0xad, 0x4e, 0x6c, 0x4e, 0xbf, 0x54, 0xa0, 0x5c, 0x47, 0x0d, 0xe4, - 0x98, 0x38, 0x34, 0x56, 0x07, 0x79, 0x0a, 0x1b, 0x3b, 0x76, 0x83, 0x60, 0xff, 0x28, 0xd6, 0x16, - 0x05, 0xc4, 0x0a, 0x43, 0x50, 0xef, 0x40, 0x99, 0xc5, 0x50, 0xc3, 0xb6, 0x24, 0xe8, 0x70, 0xd1, - 0xb4, 0x88, 0xf8, 0x0f, 0x8e, 0x47, 0xf3, 0xc3, 0xa9, 0xae, 0xde, 0xc2, 0x1d, 0xef, 0xc2, 0xb8, - 0x90, 0x7a, 0x14, 0x8d, 0x25, 0xaf, 0xfa, 0x5d, 0x18, 0xdf, 0xe6, 0xd0, 0x42, 0xc7, 0xc1, 0xe2, - 0x9a, 0x64, 0xd2, 0x2e, 0x42, 0x71, 0xd3, 0xc6, 0x6d, 0x9a, 0x2f, 0xdf, 0x73, 0xf7, 0xb1, 0xa3, - 0x9e, 0x83, 0x51, 0x9b, 0xc6, 0x20, 0xa6, 0xd5, 0xa4, 0xce, 0x1b, 0x9a, 0x0e, 0x65, 0x49, 0x26, - 0x3d, 0xff, 0x3d, 0xc8, 0xef, 0x1c, 0xec, 0x0b, 0xe5, 0xfb, 0xe5, 0x4e, 0x2b, 0xad, 0x46, 0x83, - 0x02, 0xd8, 0xce, 0xee, 0x2d, 0xdc, 0xd1, 0x29, 0xa7, 0x76, 0x17, 0xa6, 0xba, 0x98, 0xc2, 0x2b, - 0x6f, 0xc2, 0x28, 0xa1, 0x6a, 0xf4, 0x1e, 0x1b, 0xf1, 0xbc, 0x21, 0xa6, 0xb3, 0xce, 0x79, 0xb4, - 0x9f, 0x29, 0x50, 0xdc, 0x20, 0x88, 0xb4, 0xc2, 0xd5, 0xf1, 0x58, 0x93, 0xbd, 0xf4, 0x80, 0xae, - 0x43, 0x49, 0xea, 0x20, 0x6c, 0x7a, 0x16, 0x0a, 0x41, 0xc7, 0x31, 0xe3, 0xe9, 0x2d, 0xd0, 0x2e, - 0x91, 0xdc, 0x3e, 0x0b, 0x05, 0x13, 0x11, 0x73, 0xcf, 0x76, 0x76, 0x8d, 0x96, 0x27, 0xb6, 0x16, - 0xc8, 0xae, 0xfb, 0x9e, 0xf6, 0x40, 0x81, 0xb3, 0x1c, 0x74, 0x83, 0xf8, 0x18, 0x35, 0x9f, 0xa0, - 0x79, 0x3e, 0x9c, 0x8b, 0x6b, 0x22, 0x8c, 0xfc, 0x0e, 0x5c, 0x68, 0x20, 0x82, 0x03, 0x62, 0xec, - 0x3b, 0x6e, 0xdb, 0x31, 0xb6, 0x1b, 0xae, 0xb9, 0x1f, 0x37, 0x79, 0x9a, 0x13, 0xdc, 0xa2, 0xe3, - 0x75, 0x3a, 0xdc, 0x35, 0x3f, 0xea, 0x9f, 0x5c, 0xd2, 0x3f, 0xda, 0x67, 0x79, 0x98, 0xbc, 0xe3, - 0x92, 0xee, 0xa6, 0x7f, 0x1e, 0x8a, 0xb6, 0x63, 0x36, 0x5a, 0x16, 0x36, 0x02, 0x0f, 0x3b, 0x44, - 0xb8, 0x6c, 0x52, 0x74, 0x6e, 0xd0, 0x3e, 0x75, 0x09, 0x26, 0xe4, 0x2e, 0xce, 0x48, 0x21, 0xb2, - 0xb6, 0xef, 0xb8, 0xd8, 0xbe, 0xbd, 0x91, 0x74, 0xe4, 0xb8, 0x91, 0xf4, 0x36, 0x94, 0x79, 0x8a, - 0x63, 0x10, 0x97, 0xe9, 0x6e, 0x55, 0xc6, 0x86, 0x49, 0x90, 0x8a, 0x9c, 0xfb, 0x9e, 0x4b, 0x6d, - 0xb4, 0x9e, 0xc4, 0x02, 0x78, 0x90, 0x83, 0xf3, 0x6c, 0x32, 0x56, 0x5c, 0x7f, 0xd3, 0x25, 0xb6, - 0xb3, 0x2b, 0x67, 0xe5, 0x0a, 0x9c, 0x39, 0x70, 0x09, 0xda, 0x6e, 0x60, 0x03, 0x91, 0xf8, 0xd4, - 0x97, 0xc5, 0xc0, 0x12, 0x11, 0x73, 0xde, 0xe3, 0xd9, 0xfc, 0x71, 0x3d, 0xfb, 0x04, 0x5c, 0xf1, - 0xfb, 0x1c, 0x94, 0xde, 0xb7, 0x89, 0x13, 0x39, 0x7b, 0x3f, 0x80, 0x29, 0xc7, 0x25, 0xd8, 0x30, - 0xdd, 0x66, 0xd3, 0x26, 0x4d, 0xec, 0x10, 0x7a, 0x2b, 0xa0, 0x17, 0x94, 0x5a, 0x1f, 0x2d, 0xe8, - 0xae, 0xc2, 0x37, 0x42, 0x36, 0xbd, 0x4c, 0x71, 0xba, 0xed, 0x20, 0xb5, 0x36, 0x93, 0x3f, 0xc1, - 0xda, 0xcc, 0x13, 0x70, 0x20, 0x86, 0x72, 0xe8, 0x3f, 0x11, 0x47, 0x74, 0x98, 0x6c, 0xf3, 0x2e, - 0x9e, 0x6c, 0x0f, 0x51, 0x2c, 0x11, 0x50, 0x2c, 0xeb, 0x2e, 0xb4, 0xbb, 0x0d, 0xed, 0x6f, 0x0a, - 0x4c, 0x8b, 0xc1, 0xff, 0xcf, 0x82, 0x57, 0x03, 0x66, 0x7a, 0xec, 0x7b, 0x7c, 0xe5, 0xae, 0xdf, - 0xe5, 0xa1, 0xc8, 0x42, 0x65, 0xb8, 0xea, 0xab, 0x30, 0xc1, 0xf3, 0x24, 0xcc, 0x2b, 0x49, 0x13, - 0x7a, 0xd8, 0x56, 0x7f, 0x0c, 0xb3, 0x91, 0x58, 0x6d, 0xda, 0x3b, 0xb6, 0x69, 0x58, 0xd8, 0x71, - 0x9b, 0xb6, 0x23, 0x4a, 0x04, 0x7c, 0x7f, 0xf4, 0xcb, 0x5b, 0x96, 0x29, 0x8f, 0xfe, 0x74, 0x37, - 0xc4, 0x33, 0xa8, 0xe5, 0x28, 0x92, 0xba, 0x08, 0x17, 0xa4, 0xac, 0x6e, 0xc1, 0xc0, 0x60, 0xc9, - 0x41, 0xc0, 0xf6, 0xca, 0x84, 0x3e, 0x23, 0x08, 0x96, 0xc3, 0x71, 0x96, 0x42, 0x04, 0xea, 0x1b, - 0x50, 0x91, 0xbc, 0x2d, 0x67, 0xdb, 0x75, 0x2c, 0x7a, 0x1a, 0x0b, 0xd6, 0x11, 0xc6, 0x3a, 0x2d, - 0xc6, 0xef, 0xcb, 0x61, 0xc1, 0x79, 0x09, 0xca, 0x92, 0xb3, 0xe1, 0x19, 0xce, 0x0e, 0x09, 0x2a, - 0xa3, 0x8c, 0x41, 0x1e, 0x52, 0xef, 0x79, 0x77, 0x76, 0x48, 0xa0, 0x2e, 0xc0, 0x79, 0x49, 0xe7, - 0xf9, 0xae, 0xe7, 0x06, 0xa8, 0xc1, 0xa9, 0xc7, 0x18, 0xf5, 0x59, 0x31, 0xb8, 0x2e, 0xc6, 0x18, - 0xcf, 0x12, 0x3c, 0x23, 0x79, 0x0e, 0x58, 0xb0, 0x35, 0x7c, 0x6c, 0x62, 0xdb, 0x23, 0x52, 0xb5, - 0x71, 0xc6, 0x5b, 0x15, 0x44, 0x32, 0x20, 0x33, 0x12, 0xae, 0x9e, 0x86, 0xa1, 0x24, 0x67, 0x4b, - 0xac, 0x89, 0x0d, 0x28, 0xb1, 0x19, 0x30, 0x9a, 0x98, 0xa0, 0xc8, 0x82, 0x7c, 0x79, 0x90, 0x29, - 0xb8, 0x2d, 0x78, 0xf4, 0xa2, 0x15, 0x6d, 0x6a, 0x15, 0x98, 0xbe, 0xb1, 0x87, 0x6c, 0x67, 0x1d, - 0xf9, 0xa8, 0x89, 0x09, 0xf6, 0xe5, 0xea, 0xd0, 0xf6, 0x60, 0xa6, 0x67, 0x44, 0x68, 0x72, 0x1b, - 0xc0, 0x0b, 0x7b, 0xb3, 0x52, 0x49, 0x56, 0x94, 0x0f, 0x95, 0x48, 0x42, 0x45, 0x00, 0xb4, 0x69, - 0x38, 0xb7, 0x72, 0x7b, 0xb9, 0x57, 0x03, 0x0b, 0xce, 0x27, 0xfa, 0x85, 0xfc, 0x5b, 0x29, 0xf2, - 0x5f, 0x7a, 0xb4, 0xfc, 0x95, 0xa6, 0x95, 0x21, 0xfd, 0xf3, 0x1c, 0xcc, 0xd0, 0x93, 0xb1, 0xde, - 0x89, 0x84, 0x71, 0xb1, 0x43, 0xde, 0x87, 0x72, 0xe2, 0x5c, 0x10, 0x3e, 0x1f, 0xf6, 0x58, 0x28, - 0xc5, 0x8f, 0x85, 0xb4, 0x42, 0x70, 0x3e, 0xad, 0x10, 0xfc, 0x24, 0xc2, 0xbb, 0x03, 0x95, 0x5e, - 0x7f, 0x84, 0x71, 0xbe, 0xc4, 0xd2, 0x1f, 0x96, 0x2e, 0x50, 0x9b, 0x7a, 0xbd, 0x1f, 0xcf, 0xf8, - 0x37, 0x24, 0x35, 0x85, 0xd4, 0xb1, 0xe9, 0xfa, 0x96, 0x5e, 0x0c, 0xa2, 0x9d, 0x6c, 0x02, 0x36, - 0xda, 0xc8, 0xcb, 0x98, 0x80, 0xa0, 0x8d, 0xbc, 0x13, 0x98, 0x00, 0x0a, 0xf3, 0x3f, 0x32, 0x01, - 0x3a, 0x54, 0x7a, 0xfd, 0x11, 0xd6, 0xfd, 0x47, 0xa8, 0x25, 0xc2, 0xed, 0x5a, 0xa6, 0xdb, 0xdb, - 0xc8, 0x13, 0xde, 0x66, 0xf4, 0xda, 0xbf, 0x14, 0x98, 0xbe, 0xd3, 0x6a, 0x34, 0xec, 0x1d, 0x1b, - 0xfb, 0xf1, 0xdb, 0xd6, 0x0a, 0x9c, 0x76, 0xe4, 0x88, 0xf0, 0xee, 0x5c, 0x1f, 0xd3, 0x42, 0x24, - 0xbd, 0xcb, 0xfa, 0x5f, 0xed, 0xd2, 0x79, 0x98, 0xe9, 0xb1, 0x5e, 0x78, 0xf4, 0x1c, 0x8c, 0xf2, - 0xdb, 0x08, 0x3f, 0x02, 0x79, 0x43, 0xdb, 0x84, 0xa7, 0x23, 0x27, 0xe9, 0x9a, 0xb3, 0xe3, 0xd6, - 0x3b, 0xab, 0x28, 0x08, 0xaf, 0xd1, 0xfc, 0xfd, 0x25, 0x37, 0xec, 0xfb, 0x8b, 0xf6, 0xa9, 0x02, - 0xd3, 0x09, 0x60, 0x09, 0x79, 0x09, 0x26, 0x03, 0x82, 0xfc, 0x78, 0x0e, 0xbe, 0x7a, 0x4a, 0x2f, - 0xb0, 0x5e, 0x9e, 0x81, 0x3f, 0x50, 0x14, 0x55, 0x03, 0xc0, 0x8e, 0x15, 0xbb, 0x77, 0xad, 0x2a, - 0xfa, 0x69, 0xec, 0x58, 0x21, 0x4d, 0xbd, 0x0c, 0x45, 0x23, 0x0a, 0x56, 0x2f, 0x42, 0xc1, 0xe8, - 0x72, 0x69, 0xff, 0xcc, 0x41, 0x39, 0xa1, 0x86, 0xfa, 0x14, 0x8c, 0x25, 0x24, 0x8b, 0x36, 0x15, - 0x7a, 0x44, 0x7b, 0x93, 0x89, 0x4c, 0xfe, 0x04, 0x1e, 0xd1, 0xb6, 0xa0, 0xe0, 0x61, 0x9f, 0x66, - 0x25, 0xc4, 0x3e, 0xc0, 0xe2, 0x72, 0xb7, 0x38, 0x6c, 0xde, 0xd7, 0x45, 0xd0, 0xa3, 0x70, 0xea, - 0x4d, 0x18, 0xa1, 0x5b, 0x89, 0xe5, 0x02, 0xc3, 0xa7, 0x93, 0x9b, 0x36, 0x6e, 0xeb, 0x0c, 0xa0, - 0x7e, 0x1a, 0xc6, 0xa5, 0xb7, 0x7f, 0x08, 0x33, 0x3d, 0x73, 0xde, 0x2d, 0xaf, 0x91, 0x43, 0xc3, - 0x76, 0x76, 0x5c, 0xb1, 0xa5, 0x2f, 0x0f, 0xf0, 0xe6, 0xc2, 0x10, 0xc6, 0xc8, 0x21, 0xfd, 0xab, - 0x21, 0x78, 0x26, 0x63, 0xa5, 0x9e, 0x98, 0x88, 0x8f, 0xa0, 0x28, 0x2e, 0xf2, 0x02, 0xf2, 0x3d, - 0x28, 0xb0, 0x73, 0xd1, 0x67, 0x21, 0xe6, 0x28, 0x67, 0x00, 0x38, 0xe1, 0x6f, 0xed, 0x4b, 0x1a, - 0x9b, 0x12, 0x77, 0xd3, 0xc7, 0x21, 0x48, 0xbd, 0x0d, 0x93, 0xb6, 0x85, 0x1d, 0x62, 0x93, 0x8e, - 0xb1, 0x8f, 0x3b, 0x62, 0x39, 0x5f, 0xe9, 0x13, 0x74, 0xd6, 0x04, 0xcb, 0x2d, 0xdc, 0xd1, 0x0b, - 0x76, 0xb7, 0xa1, 0xfd, 0x3b, 0x0f, 0x67, 0x53, 0x44, 0xa6, 0x65, 0x0d, 0xca, 0x89, 0x64, 0x0d, - 0xdf, 0x86, 0x11, 0x76, 0xe6, 0x72, 0xbd, 0x9f, 0xef, 0x17, 0xa4, 0xa9, 0x46, 0x8c, 0xe1, 0x31, - 0xdc, 0xdb, 0x63, 0x87, 0xc6, 0xc8, 0xd1, 0x0f, 0x8d, 0x8b, 0x50, 0xe2, 0x9b, 0xc4, 0x30, 0x7d, - 0x8c, 0x08, 0xb6, 0xd8, 0xc6, 0x1b, 0xd1, 0x8b, 0xbc, 0xf7, 0x06, 0xef, 0xa4, 0xb1, 0x51, 0x90, - 0xf1, 0x58, 0x3d, 0x26, 0x63, 0x23, 0xef, 0x65, 0xa5, 0x23, 0x1a, 0xa6, 0xaa, 0x30, 0xe1, 0xb9, - 0x81, 0xcd, 0x62, 0xcd, 0x38, 0x03, 0x0a, 0xdb, 0xea, 0x3b, 0x30, 0x16, 0xb8, 0x2d, 0xdf, 0xc4, - 0x95, 0x89, 0x74, 0x7d, 0xe3, 0x19, 0x23, 0x75, 0xdf, 0x06, 0xa3, 0xd7, 0x05, 0x1f, 0x8b, 0xaa, - 0x51, 0x35, 0xb4, 0xbf, 0xe6, 0x01, 0xba, 0x47, 0x6d, 0x5a, 0xb6, 0xa2, 0x9c, 0x48, 0xb6, 0xf2, - 0xb6, 0x38, 0xf5, 0xf9, 0xc4, 0xbf, 0x98, 0x40, 0xb3, 0xf0, 0x61, 0xfc, 0xe4, 0x5f, 0x6f, 0x20, - 0xdb, 0x21, 0xf8, 0x90, 0xf0, 0xc3, 0x3f, 0xe6, 0x95, 0x7c, 0xc2, 0x2b, 0x27, 0x35, 0x91, 0xeb, - 0x50, 0xe0, 0x2f, 0xdf, 0xfc, 0xae, 0x3c, 0x9a, 0x1a, 0xe8, 0x63, 0x9a, 0xd6, 0x11, 0x31, 0xf7, - 0xa8, 0xba, 0xfc, 0x35, 0x97, 0xdd, 0x92, 0xc1, 0x0d, 0x7f, 0xab, 0x57, 0xba, 0x4b, 0xa3, 0x81, - 0xec, 0x26, 0xb6, 0xc2, 0x59, 0x97, 0x8b, 0x83, 0x77, 0xd3, 0x79, 0xef, 0xce, 0xed, 0xf8, 0x11, - 0xe7, 0xf6, 0x0c, 0x94, 0x8d, 0xb8, 0x38, 0xed, 0xef, 0x0a, 0xcc, 0xdc, 0x6d, 0x3b, 0xd8, 0x5a, - 0x17, 0xce, 0x5a, 0xb3, 0xc2, 0xa4, 0xe9, 0x3e, 0x94, 0xa4, 0x0b, 0xe9, 0x41, 0x1b, 0x26, 0xc2, - 0x8f, 0x9c, 0x1b, 0x89, 0xc3, 0xa6, 0x9b, 0xda, 0xe1, 0x45, 0x3b, 0xa8, 0x1d, 0x77, 0x61, 0x92, - 0xf8, 0x88, 0x5d, 0x62, 0x3d, 0x64, 0xcb, 0x74, 0xec, 0xf2, 0xa3, 0x40, 0xef, 0x71, 0xfa, 0x75, - 0x64, 0xfb, 0xab, 0x0a, 0x3b, 0x29, 0x65, 0x93, 0x26, 0x02, 0xd4, 0xac, 0xb8, 0xa2, 0x6c, 0x15, - 0x47, 0x85, 0x68, 0x26, 0x54, 0x7a, 0xcd, 0x0c, 0x9f, 0x32, 0x0b, 0x21, 0x7b, 0xe6, 0x07, 0x27, - 0xa9, 0x46, 0xae, 0x59, 0x3a, 0x78, 0xe1, 0xef, 0x85, 0x3f, 0x9c, 0x85, 0xb3, 0xf4, 0x74, 0x5c, - 0xf7, 0x5d, 0xe2, 0x9a, 0x6e, 0x63, 0x03, 0xfb, 0x07, 0xb6, 0x89, 0xd5, 0xf7, 0x61, 0x8c, 0x27, - 0x64, 0x6a, 0xe6, 0xab, 0x41, 0x2c, 0x5d, 0xad, 0x5e, 0xea, 0x47, 0x26, 0x34, 0xdf, 0x87, 0xc9, - 0x68, 0xc9, 0x5b, 0x7d, 0xe9, 0xd1, 0x7c, 0xb1, 0x12, 0x7d, 0xf5, 0xe5, 0xc1, 0x88, 0xb9, 0xa8, - 0xab, 0x8a, 0xba, 0x09, 0xa3, 0xec, 0x04, 0x53, 0x5f, 0xc8, 0x62, 0x8c, 0x56, 0xc2, 0xab, 0x17, - 0xfb, 0x50, 0x85, 0xb8, 0x1f, 0x43, 0x29, 0x7e, 0x32, 0xaa, 0xaf, 0x3c, 0x92, 0x35, 0x59, 0xdd, - 0xad, 0xd6, 0x06, 0x25, 0x0f, 0x45, 0x7e, 0x08, 0xe3, 0xa2, 0x2a, 0xa5, 0x66, 0xba, 0x3a, 0x5e, - 0x3e, 0xad, 0x5e, 0xee, 0x4b, 0x27, 0xe6, 0xc4, 0x0f, 0x2b, 0x87, 0xb2, 0xe2, 0xa5, 0xd6, 0xfa, - 0xf0, 0x26, 0x4a, 0x7f, 0xd5, 0xf9, 0x81, 0xe9, 0x85, 0xcc, 0x0f, 0x60, 0x8c, 0x17, 0x52, 0xb2, - 0x17, 0x58, 0xac, 0x2c, 0x96, 0xbd, 0xc0, 0xe2, 0xf5, 0x98, 0xab, 0x0a, 0x35, 0x27, 0x51, 0xd7, - 0xc8, 0x36, 0x27, 0xbd, 0xca, 0x92, 0x6d, 0x4e, 0x56, 0xed, 0xa5, 0x01, 0xc5, 0x58, 0x51, 0x44, - 0xcd, 0x5c, 0xaa, 0x69, 0x35, 0x95, 0xea, 0x2b, 0x03, 0x52, 0x0b, 0x69, 0x2e, 0x94, 0xe2, 0x6f, - 0xfd, 0xd9, 0xeb, 0x2f, 0xf5, 0x3b, 0x85, 0xec, 0xf5, 0x97, 0xf1, 0x09, 0x81, 0x0b, 0xa5, 0xf8, - 0x23, 0x7d, 0xb6, 0xc0, 0xd4, 0x0f, 0x05, 0xb2, 0x05, 0x66, 0xbc, 0xfd, 0xb7, 0x60, 0x2a, 0xf9, - 0xf6, 0xad, 0x66, 0x4e, 0x4a, 0xc6, 0xdb, 0x7d, 0xf5, 0xea, 0xe0, 0x0c, 0x42, 0xac, 0x01, 0x13, - 0xf2, 0x6d, 0x59, 0xcd, 0xdc, 0x3e, 0x89, 0x57, 0xf3, 0xea, 0x5c, 0x7f, 0xc2, 0x70, 0x6d, 0xb6, - 0x60, 0x2a, 0x59, 0xc5, 0xc9, 0xb6, 0x2b, 0xa3, 0xfe, 0x95, 0x6d, 0x57, 0x66, 0x81, 0xa8, 0x05, - 0x53, 0xc9, 0xda, 0x45, 0xb6, 0xd8, 0x8c, 0xaa, 0x4f, 0xb6, 0xd8, 0xcc, 0xb2, 0x88, 0x0f, 0xe5, - 0xc4, 0xfd, 0x3e, 0x7b, 0x27, 0xa6, 0x97, 0x41, 0xb2, 0x77, 0x62, 0x56, 0xe1, 0xe0, 0x53, 0x05, - 0xce, 0xa7, 0xde, 0xbc, 0xd4, 0xeb, 0x03, 0x5e, 0xb0, 0x62, 0x25, 0x85, 0xea, 0x6b, 0x43, 0x72, - 0x09, 0x35, 0x48, 0xef, 0x4d, 0xbe, 0x36, 0xe8, 0x05, 0xaf, 0x9f, 0xe9, 0x19, 0xb7, 0xd6, 0xab, - 0x8a, 0xfa, 0x53, 0x50, 0x7b, 0x3f, 0x80, 0x52, 0xaf, 0x0d, 0xfd, 0xc1, 0x60, 0x75, 0x61, 0x18, - 0x16, 0x61, 0xf2, 0x27, 0x0a, 0x9c, 0x4b, 0xfb, 0x3a, 0x56, 0x7d, 0x35, 0x73, 0x83, 0x64, 0x7f, - 0xe7, 0x5b, 0xbd, 0x3e, 0x1c, 0x93, 0xd0, 0xa1, 0x0d, 0x53, 0xc9, 0xa4, 0x29, 0x7b, 0xa1, 0x67, - 0x64, 0x91, 0xd9, 0x0b, 0x3d, 0x2b, 0x1f, 0xbb, 0xaa, 0xa8, 0x87, 0x70, 0xa6, 0xe7, 0x33, 0x69, - 0x35, 0x13, 0x28, 0xeb, 0x9b, 0xf1, 0xea, 0xb5, 0x21, 0x38, 0xb8, 0xec, 0x05, 0xaf, 0xfb, 0x35, - 0x89, 0xcc, 0xde, 0x3e, 0x82, 0x09, 0xd9, 0x95, 0x1d, 0xc6, 0x12, 0x9f, 0xa0, 0x64, 0x87, 0xb1, - 0xe4, 0x77, 0x25, 0xf5, 0xcf, 0x72, 0x7f, 0x7a, 0x38, 0xab, 0x7c, 0xf5, 0x70, 0x56, 0xf9, 0xfa, - 0xe1, 0xac, 0xf2, 0xcb, 0x6f, 0x66, 0x4f, 0x7d, 0xf5, 0xcd, 0xec, 0xa9, 0xbf, 0x7c, 0x33, 0x7b, - 0x0a, 0xaa, 0xa6, 0xdb, 0xcc, 0xc0, 0xa9, 0x9f, 0x0e, 0x13, 0xcd, 0x75, 0xe5, 0xc3, 0xbb, 0xbb, - 0x36, 0xd9, 0x6b, 0x6d, 0xd7, 0x4c, 0xb7, 0x39, 0x6f, 0xba, 0x41, 0xd3, 0x0d, 0xe6, 0x7d, 0xdc, - 0x40, 0x1d, 0xec, 0xcf, 0x1f, 0x2c, 0x84, 0x3f, 0xd9, 0x05, 0x21, 0x98, 0x4f, 0xff, 0x17, 0x85, - 0x37, 0x69, 0x4b, 0x36, 0x7e, 0x93, 0xcb, 0xaf, 0x6f, 0xfe, 0xe0, 0xb7, 0xb9, 0xe9, 0x75, 0x29, - 0x9c, 0x4a, 0xab, 0x6d, 0x8a, 0xe1, 0x3f, 0x77, 0x07, 0xb6, 0xe8, 0xc0, 0x96, 0x1c, 0x78, 0x98, - 0xd3, 0xd2, 0x07, 0xb6, 0x6e, 0xae, 0xd7, 0xe5, 0x7b, 0xcc, 0x3f, 0x72, 0x15, 0x49, 0xb4, 0xb8, - 0x48, 0xa9, 0x16, 0x17, 0x25, 0xd9, 0xf6, 0x18, 0xfb, 0x4f, 0x80, 0x57, 0xff, 0x13, 0x00, 0x00, - 0xff, 0xff, 0x56, 0x54, 0x09, 0x86, 0x48, 0x31, 0x00, 0x00, + 0x15, 0xf7, 0x92, 0xfa, 0xf2, 0xa3, 0x48, 0xca, 0x63, 0x5b, 0xa2, 0x99, 0x44, 0x49, 0x37, 0xf1, + 0x47, 0x9c, 0x84, 0xb2, 0x15, 0x27, 0x4d, 0x95, 0xa4, 0x8d, 0x68, 0x45, 0x96, 0xe0, 0xd8, 0x56, + 0x57, 0xb6, 0xdc, 0xa4, 0x4a, 0x17, 0xa3, 0xdd, 0x91, 0xb4, 0x15, 0xb9, 0xbb, 0xd9, 0x1d, 0xea, + 0xa3, 0x3d, 0xa5, 0x08, 0x0a, 0x23, 0x40, 0x83, 0xa0, 0xe8, 0xa5, 0xd7, 0x1e, 0x8b, 0x5e, 0x73, + 0x2d, 0x0a, 0xf4, 0x52, 0xf4, 0x94, 0x63, 0x81, 0x02, 0x45, 0x60, 0xa3, 0x97, 0xf6, 0x5f, 0x28, + 0xd0, 0x62, 0xbe, 0x96, 0xbb, 0x4b, 0xae, 0x49, 0x4a, 0x32, 0x1c, 0xf4, 0x24, 0xce, 0xcc, 0x7b, + 0xbf, 0xf7, 0x31, 0x33, 0x6f, 0xde, 0xbc, 0x59, 0xc1, 0x77, 0x7c, 0xe2, 0xb6, 0x9a, 0x1b, 0x01, + 0x9e, 0xd9, 0x75, 0xc8, 0xde, 0xcc, 0xee, 0x55, 0xdc, 0xf0, 0xb7, 0xf1, 0x55, 0xde, 0xaa, 0xf9, + 0x81, 0x47, 0x3d, 0x34, 0xa9, 0x48, 0x6a, 0xbc, 0x53, 0x91, 0x54, 0x2f, 0x45, 0xac, 0x96, 0x17, + 0x90, 0x19, 0x6b, 0x1b, 0x3b, 0x6e, 0x1b, 0x80, 0x37, 0x05, 0x42, 0xf5, 0x72, 0x8a, 0x32, 0x38, + 0xf0, 0xa9, 0x17, 0x23, 0xe5, 0x6d, 0x49, 0xfb, 0x52, 0x92, 0xd6, 0x26, 0xfb, 0x6d, 0x42, 0x9b, + 0xec, 0x4b, 0xaa, 0x6b, 0x49, 0x2a, 0x1a, 0x60, 0x37, 0xc4, 0x16, 0x75, 0xbc, 0x98, 0x06, 0xb1, + 0xce, 0xee, 0xd8, 0xce, 0x86, 0xd5, 0xa6, 0x76, 0x36, 0x2c, 0x49, 0x95, 0xb2, 0x2b, 0xa4, 0x78, + 0x87, 0xb4, 0xe9, 0x78, 0x53, 0x50, 0xea, 0xdf, 0x68, 0x50, 0x99, 0x6f, 0xd1, 0x6d, 0x2f, 0x70, + 0x7e, 0x46, 0xe6, 0x5d, 0xbb, 0xde, 0x72, 0x1a, 0xb6, 0x41, 0x3e, 0x69, 0x91, 0x90, 0xa2, 0x9f, + 0xc0, 0x44, 0x4c, 0x03, 0xd3, 0x6f, 0x60, 0xb7, 0xa2, 0xbd, 0xa0, 0x5d, 0x2a, 0xcc, 0xbe, 0x5e, + 0x8b, 0x3c, 0xca, 0x24, 0xd4, 0xe2, 0x8a, 0x2a, 0x39, 0xb5, 0xbb, 0xed, 0xce, 0x95, 0x06, 0x76, + 0x8d, 0x32, 0x4d, 0x76, 0x20, 0x1b, 0x10, 0x96, 0xb2, 0x31, 0x97, 0x60, 0x63, 0x8a, 0x2b, 0x39, + 0x2e, 0xe1, 0x8d, 0x7e, 0x24, 0xcc, 0xc7, 0xb9, 0x17, 0x30, 0xc5, 0xc6, 0x29, 0x9c, 0xee, 0xd2, + 0x5d, 0x38, 0xd7, 0xc5, 0xc2, 0xd0, 0xf7, 0xdc, 0x90, 0xa0, 0x1f, 0x42, 0x21, 0x86, 0x2c, 0xad, + 0x9b, 0x19, 0xd0, 0x3a, 0x23, 0x8e, 0xa1, 0xff, 0x56, 0x83, 0x67, 0xea, 0x81, 0x87, 0x6d, 0x0b, + 0x87, 0x34, 0x4e, 0x25, 0xbd, 0x7a, 0xfc, 0x22, 0xd1, 0x45, 0x28, 0xe3, 0x3d, 0xec, 0x50, 0xd3, + 0x26, 0x94, 0x08, 0x58, 0xe6, 0xc5, 0x31, 0xa3, 0xc4, 0xbb, 0x17, 0x54, 0xaf, 0xfe, 0xa9, 0x06, + 0xcf, 0x76, 0xd7, 0x4d, 0xfa, 0xe3, 0x4d, 0xc8, 0x39, 0xb6, 0xd4, 0xe9, 0x42, 0x3f, 0x3a, 0x2d, + 0xdb, 0x46, 0xce, 0xb1, 0xd1, 0xcb, 0x30, 0x11, 0xc9, 0x36, 0xb7, 0x89, 0xb3, 0xb5, 0x4d, 0xb9, + 0x0a, 0x43, 0x46, 0x39, 0xea, 0x5f, 0xe2, 0xdd, 0xfa, 0x97, 0xe3, 0x70, 0x2e, 0xb5, 0x34, 0x5c, + 0x12, 0x28, 0xef, 0xbc, 0x08, 0x45, 0xb2, 0xef, 0x3b, 0xc1, 0x81, 0x42, 0xd1, 0x38, 0xca, 0xb8, + 0xe8, 0x14, 0x10, 0xe8, 0x1a, 0xe4, 0x37, 0x09, 0x91, 0x2b, 0x45, 0x4f, 0xa9, 0x29, 0xf7, 0x62, + 0xa4, 0xe1, 0x22, 0x21, 0x06, 0x23, 0x47, 0xef, 0xc3, 0x50, 0x93, 0x34, 0xbd, 0x4a, 0x9e, 0xb3, + 0x5d, 0xed, 0xc7, 0xba, 0x5b, 0xa4, 0xe9, 0xad, 0x34, 0xb0, 0xe3, 0x52, 0xb2, 0x4f, 0x0d, 0xce, + 0x8e, 0xd6, 0x61, 0x02, 0x5b, 0x96, 0xd7, 0x72, 0xa9, 0xb9, 0x15, 0x78, 0x2d, 0xdf, 0x74, 0xec, + 0x4a, 0x89, 0x43, 0xbe, 0xd6, 0x43, 0x93, 0x79, 0xc1, 0x76, 0x83, 0x71, 0x2d, 0xdb, 0x4b, 0x27, + 0x8c, 0x12, 0x4e, 0xf4, 0x3c, 0xd0, 0x34, 0x64, 0xc0, 0xa8, 0xd7, 0xa2, 0x7e, 0x8b, 0x86, 0x95, + 0x33, 0x2f, 0xe4, 0x2f, 0x15, 0x66, 0xdf, 0xaa, 0x75, 0x0f, 0x5e, 0xb5, 0x4c, 0x1f, 0xd6, 0xee, + 0x70, 0x00, 0x43, 0x01, 0xa1, 0x0f, 0x60, 0x38, 0xdc, 0xc3, 0x7e, 0x58, 0x99, 0xe6, 0x88, 0x6f, + 0x0e, 0x8e, 0xb8, 0xba, 0x87, 0x7d, 0x43, 0x80, 0xa0, 0x75, 0x28, 0xb0, 0x1f, 0xa6, 0xd5, 0xc0, + 0x4e, 0x33, 0xac, 0x3c, 0xcf, 0x31, 0xdf, 0x3e, 0x1c, 0xe6, 0x75, 0x86, 0x61, 0x40, 0xa8, 0x7e, + 0x72, 0x74, 0x9b, 0x34, 0xc8, 0x16, 0xdf, 0xbf, 0x61, 0xe5, 0x12, 0x47, 0x9f, 0x1b, 0x1c, 0x7d, + 0x41, 0x80, 0x10, 0x23, 0x0e, 0x87, 0x36, 0xa0, 0xd8, 0x72, 0xe3, 0xf8, 0xb3, 0x1c, 0xff, 0x9d, + 0xc1, 0xf1, 0xef, 0x29, 0x18, 0x62, 0x24, 0x21, 0xd1, 0x22, 0x14, 0x9c, 0x0d, 0xcb, 0x14, 0x5c, + 0x61, 0xe5, 0x1d, 0x2e, 0xe1, 0x7c, 0x6a, 0x69, 0xb0, 0x58, 0xdd, 0xde, 0x43, 0x1b, 0xd6, 0xbc, + 0xd8, 0x86, 0xe0, 0xa8, 0x9f, 0x61, 0xf5, 0x97, 0x1a, 0x8c, 0x88, 0x99, 0x44, 0x73, 0x30, 0xbc, + 0x8b, 0x1b, 0x2d, 0x22, 0x37, 0xe6, 0x4b, 0x3d, 0xd6, 0xd9, 0x1a, 0xa3, 0x35, 0x04, 0x0b, 0x7a, + 0x0f, 0x46, 0xb1, 0x6d, 0x07, 0x24, 0x0c, 0xe5, 0x7e, 0xb9, 0xd0, 0x6b, 0x95, 0x0a, 0x6a, 0x43, + 0xb1, 0x55, 0xff, 0xac, 0xc1, 0x10, 0x9b, 0xac, 0x23, 0xa9, 0xb1, 0x0c, 0xe3, 0x14, 0x07, 0x5b, + 0x84, 0x9a, 0x38, 0x0c, 0x09, 0xed, 0x57, 0x17, 0x46, 0xbb, 0x6c, 0x1b, 0x05, 0xc1, 0xcb, 0x9b, + 0x6a, 0xf7, 0xe7, 0x07, 0xda, 0xfd, 0x55, 0x1b, 0x4e, 0x46, 0x2b, 0x0e, 0xdd, 0x87, 0xb2, 0x58, + 0xc3, 0x5e, 0xb3, 0xe9, 0xd0, 0x26, 0x71, 0xa9, 0xb4, 0xa9, 0xd6, 0x03, 0x6e, 0x95, 0x62, 0x4a, + 0xae, 0x47, 0x5c, 0x46, 0x89, 0x2f, 0xdd, 0xa8, 0x5d, 0xfd, 0x42, 0x83, 0x31, 0xb5, 0xf4, 0xd0, + 0xbb, 0x30, 0x82, 0x9b, 0x6c, 0x7f, 0x4b, 0xf0, 0xf3, 0xbd, 0xac, 0xe5, 0xc4, 0x86, 0x64, 0x42, + 0xd7, 0xe1, 0x64, 0x80, 0x29, 0x11, 0xa7, 0x62, 0xbe, 0xab, 0xbf, 0xc4, 0x51, 0x1e, 0x01, 0x18, + 0x98, 0x12, 0x7e, 0x0c, 0x8e, 0x05, 0xf2, 0x57, 0xf5, 0x57, 0x1a, 0x40, 0x7b, 0xad, 0x1e, 0x69, + 0x0a, 0x13, 0xfa, 0xe4, 0x0e, 0xa7, 0x4f, 0xfd, 0x34, 0x9c, 0x32, 0xd3, 0xe1, 0x53, 0x27, 0x50, + 0xed, 0xb6, 0xd3, 0xe4, 0x99, 0x74, 0x03, 0x86, 0x8e, 0x9a, 0x7a, 0x70, 0x00, 0xfd, 0xd7, 0x1a, + 0x9c, 0x95, 0xab, 0xbb, 0x7e, 0xb0, 0xec, 0xda, 0x64, 0x5f, 0x9d, 0x3a, 0x2b, 0x50, 0x94, 0xab, + 0xdd, 0x74, 0x58, 0xbf, 0x94, 0xf5, 0x4a, 0x7f, 0x5b, 0x45, 0x40, 0x8d, 0xe3, 0x58, 0x8b, 0x1d, + 0xc9, 0xb6, 0x13, 0xfa, 0x0d, 0x7c, 0x60, 0x5a, 0x9e, 0xbb, 0xe9, 0x04, 0x4d, 0x75, 0x24, 0xcb, + 0xee, 0xeb, 0xa2, 0x57, 0xff, 0x08, 0x26, 0xd3, 0x3a, 0x49, 0xbb, 0x63, 0x3b, 0x57, 0x3b, 0xd4, + 0xce, 0xd5, 0x3f, 0x84, 0xb3, 0x1c, 0xb2, 0x7e, 0xa0, 0x86, 0xa4, 0xbd, 0x47, 0x87, 0xfe, 0x54, + 0x83, 0xc9, 0x34, 0xb6, 0xd4, 0xfb, 0xde, 0xd1, 0x9d, 0xb9, 0x74, 0x22, 0xe9, 0xce, 0x07, 0x9a, + 0x56, 0x9f, 0x80, 0x92, 0x99, 0xc0, 0xd5, 0x7f, 0xa3, 0xc1, 0xd4, 0xfb, 0xfe, 0x36, 0x69, 0x92, + 0x00, 0x37, 0x52, 0x16, 0x3e, 0xc5, 0x19, 0x5d, 0x87, 0x4a, 0xa7, 0x56, 0xc7, 0x36, 0xa7, 0x5f, + 0x69, 0x50, 0xae, 0xe3, 0x06, 0x76, 0x2d, 0x12, 0x19, 0x6b, 0x80, 0xca, 0x24, 0xcc, 0x4d, 0xa7, + 0x41, 0x49, 0x70, 0x18, 0x6b, 0x8b, 0x12, 0x62, 0x91, 0x23, 0xa0, 0xdb, 0x50, 0xe6, 0x91, 0xda, + 0x74, 0x6c, 0x05, 0x3a, 0x58, 0xcc, 0x2e, 0x62, 0xf1, 0x43, 0xe0, 0xb1, 0xb4, 0x78, 0xa2, 0xad, + 0xb7, 0x74, 0xc7, 0xfb, 0x30, 0x2a, 0xa5, 0x1e, 0x46, 0x63, 0xc5, 0x8b, 0xbe, 0x0f, 0xa3, 0x1b, + 0x02, 0x5a, 0xea, 0xd8, 0x5f, 0x5c, 0x53, 0x4c, 0xfa, 0x79, 0x28, 0xae, 0x39, 0x64, 0x8f, 0x5d, + 0x13, 0xee, 0x7a, 0x3b, 0xc4, 0x45, 0x67, 0x60, 0xd8, 0x61, 0x31, 0x88, 0x6b, 0x35, 0x6e, 0x88, + 0x86, 0x6e, 0x40, 0x59, 0x91, 0x29, 0xcf, 0xff, 0x00, 0xf2, 0x9b, 0xbb, 0x3b, 0x52, 0xf9, 0x5e, + 0xf9, 0xdf, 0x62, 0xab, 0xd1, 0x60, 0x00, 0x8e, 0xbb, 0x75, 0x93, 0x1c, 0x18, 0x8c, 0x53, 0xbf, + 0x03, 0x13, 0x6d, 0x4c, 0xe9, 0x95, 0xb7, 0x61, 0x98, 0x32, 0x35, 0x3a, 0x8f, 0x8d, 0x64, 0x76, + 0x92, 0xd0, 0xd9, 0x10, 0x3c, 0xfa, 0x2f, 0x34, 0x28, 0xb2, 0x53, 0xaa, 0x15, 0xad, 0x8e, 0x27, + 0x9a, 0xb0, 0x76, 0x0f, 0xe8, 0x06, 0x94, 0x94, 0x0e, 0xd2, 0xa6, 0xe7, 0xa1, 0x10, 0x1e, 0xb8, + 0x56, 0x32, 0xab, 0x07, 0xd6, 0x25, 0x73, 0xfa, 0xe7, 0xa1, 0x60, 0x61, 0x6a, 0x6d, 0x3b, 0xee, + 0x96, 0xd9, 0xf2, 0xe5, 0xd6, 0x02, 0xd5, 0x75, 0xcf, 0xd7, 0x1f, 0x68, 0x70, 0x5a, 0x80, 0xae, + 0xd2, 0x80, 0xe0, 0xe6, 0x53, 0x34, 0x2f, 0x80, 0x33, 0x49, 0x4d, 0xa4, 0x91, 0xdf, 0x83, 0x73, + 0x0d, 0x4c, 0x49, 0x48, 0xcd, 0x1d, 0xd7, 0xdb, 0x73, 0xcd, 0x8d, 0x86, 0x67, 0xed, 0x24, 0x4d, + 0x9e, 0x14, 0x04, 0x37, 0xd9, 0x78, 0x9d, 0x0d, 0xb7, 0xcd, 0x8f, 0xfb, 0x27, 0x97, 0xf6, 0x8f, + 0xfe, 0x79, 0x1e, 0xc6, 0x6f, 0x7b, 0xb4, 0xbd, 0xe9, 0x5f, 0x84, 0xa2, 0xe3, 0x5a, 0x8d, 0x96, + 0x4d, 0xcc, 0xd0, 0x67, 0x19, 0x8c, 0x70, 0xd9, 0xb8, 0xec, 0x5c, 0x65, 0x7d, 0x68, 0x1e, 0xc6, + 0xd4, 0x2e, 0xce, 0x48, 0x21, 0xb2, 0xb6, 0xef, 0xa8, 0xdc, 0xbe, 0x9d, 0x91, 0x74, 0xe8, 0xa8, + 0x91, 0xf4, 0x16, 0x94, 0x45, 0x8a, 0x63, 0x52, 0x8f, 0xeb, 0x6e, 0x57, 0x46, 0x06, 0x49, 0x90, + 0x8a, 0x82, 0xfb, 0xae, 0xc7, 0x6c, 0xb4, 0x9f, 0xc6, 0x02, 0x78, 0x90, 0x83, 0xb3, 0x7c, 0x32, + 0x16, 0xbd, 0x60, 0xcd, 0xa3, 0x8e, 0xbb, 0xa5, 0x66, 0xe5, 0x32, 0x9c, 0xda, 0xf5, 0x28, 0xde, + 0x68, 0x10, 0x13, 0xd3, 0xe4, 0xd4, 0x97, 0xe5, 0xc0, 0x3c, 0x95, 0x73, 0xde, 0xe1, 0xd9, 0xfc, + 0x51, 0x3d, 0xfb, 0x14, 0x5c, 0xf1, 0xc7, 0x1c, 0x94, 0xee, 0x3b, 0xd4, 0x8d, 0x9d, 0xbd, 0x1f, + 0xc2, 0x84, 0xeb, 0x51, 0x12, 0xcb, 0xae, 0xd9, 0xdd, 0x23, 0x7f, 0x88, 0xf4, 0xba, 0xcc, 0x70, + 0xda, 0xed, 0xb0, 0x6b, 0x49, 0x2a, 0x7f, 0x8c, 0x25, 0xa9, 0xa7, 0xe0, 0x40, 0x02, 0xe5, 0xc8, + 0x7f, 0x32, 0x8e, 0x18, 0x30, 0xbe, 0x27, 0xba, 0x44, 0xb2, 0x3d, 0x40, 0x8d, 0x48, 0x42, 0xf1, + 0xac, 0xbb, 0xb0, 0xd7, 0x6e, 0xe8, 0xff, 0xd0, 0x60, 0x52, 0x0e, 0xfe, 0x7f, 0xd6, 0xf9, 0x1a, + 0x30, 0xd5, 0x61, 0xdf, 0x93, 0xab, 0xf2, 0xfd, 0x21, 0x0f, 0x45, 0x1e, 0x2a, 0xa3, 0x55, 0x5f, + 0x85, 0x31, 0x91, 0x27, 0x11, 0x51, 0x40, 0x1b, 0x33, 0xa2, 0x36, 0xfa, 0x29, 0x4c, 0xc7, 0x62, + 0xb5, 0xe5, 0x6c, 0x3a, 0x96, 0x69, 0x13, 0xd7, 0x6b, 0x3a, 0xae, 0x2c, 0x44, 0x88, 0xfd, 0xd1, + 0x2b, 0x6f, 0x59, 0x60, 0x3c, 0xc6, 0xb3, 0xed, 0x10, 0xcf, 0xa1, 0x16, 0xe2, 0x48, 0x68, 0x0e, + 0xce, 0x29, 0x59, 0xed, 0xb2, 0x84, 0xc9, 0x93, 0x83, 0x90, 0xef, 0x95, 0x31, 0x63, 0x4a, 0x12, + 0x2c, 0x44, 0xe3, 0x3c, 0x85, 0x08, 0xd1, 0x5b, 0x50, 0x51, 0xbc, 0x2d, 0x77, 0xc3, 0x73, 0x6d, + 0x76, 0x1a, 0x4b, 0xd6, 0x21, 0xce, 0x3a, 0x29, 0xc7, 0xef, 0xa9, 0x61, 0xc9, 0x79, 0x01, 0xca, + 0x8a, 0xb3, 0xe1, 0x9b, 0xee, 0x26, 0x0d, 0x2b, 0xc3, 0x9c, 0x41, 0x1d, 0x52, 0x1f, 0xf8, 0xb7, + 0x37, 0x69, 0x88, 0x66, 0xe1, 0xac, 0xa2, 0xf3, 0x03, 0xcf, 0xf7, 0x42, 0xdc, 0x10, 0xd4, 0x23, + 0x9c, 0xfa, 0xb4, 0x1c, 0x5c, 0x91, 0x63, 0x9c, 0x67, 0x1e, 0x9e, 0x53, 0x3c, 0xbb, 0x3c, 0xd8, + 0x9a, 0x01, 0xb1, 0x88, 0xe3, 0x53, 0xa5, 0xda, 0x28, 0xe7, 0xad, 0x4a, 0x22, 0x15, 0x90, 0x39, + 0x89, 0x50, 0x4f, 0x27, 0x50, 0x52, 0xb3, 0x25, 0xd7, 0xc4, 0x2a, 0x94, 0xf8, 0x0c, 0x98, 0x4d, + 0x42, 0x71, 0x6c, 0x41, 0xbe, 0xda, 0xcf, 0x14, 0xdc, 0x92, 0x3c, 0x46, 0xd1, 0x8e, 0x37, 0xf5, + 0x0a, 0x4c, 0x5e, 0xdf, 0xc6, 0x8e, 0xbb, 0x82, 0x03, 0xdc, 0x24, 0x94, 0x04, 0x6a, 0x75, 0xe8, + 0xdb, 0x30, 0xd5, 0x31, 0x22, 0x35, 0xb9, 0x05, 0xe0, 0x47, 0xbd, 0x59, 0xa9, 0x24, 0x7f, 0x8b, + 0x88, 0x94, 0x48, 0x43, 0xc5, 0x00, 0xf4, 0x49, 0x38, 0xb3, 0x78, 0x6b, 0xa1, 0x53, 0x03, 0x1b, + 0xce, 0xa6, 0xfa, 0xa5, 0xfc, 0x9b, 0x5d, 0xe4, 0xbf, 0xf2, 0x78, 0xf9, 0x8b, 0x4d, 0x3b, 0x43, + 0xfa, 0x17, 0x39, 0x98, 0x62, 0x27, 0x63, 0xfd, 0x20, 0x16, 0xc6, 0xe5, 0x0e, 0xb9, 0x0f, 0xe5, + 0xd4, 0xb9, 0x20, 0x7d, 0x3e, 0x70, 0xd5, 0x25, 0x79, 0x2c, 0x74, 0xab, 0x7f, 0xe7, 0xbb, 0xd5, + 0xbf, 0x9f, 0x46, 0x78, 0x77, 0xa1, 0xd2, 0xe9, 0x8f, 0x28, 0xce, 0x97, 0x78, 0xfa, 0xc3, 0xd3, + 0x05, 0x66, 0x53, 0xa7, 0xf7, 0x93, 0x19, 0xff, 0xaa, 0xa2, 0x66, 0x90, 0x06, 0xb1, 0xbc, 0xc0, + 0x36, 0x8a, 0x61, 0xbc, 0x93, 0x4f, 0xc0, 0xea, 0x1e, 0xf6, 0x33, 0x26, 0x20, 0x5d, 0xf6, 0xca, + 0x1d, 0x47, 0xd9, 0xeb, 0x5b, 0x3d, 0x01, 0x06, 0x54, 0x3a, 0xfd, 0x11, 0x3d, 0x77, 0x0c, 0x31, + 0x4b, 0xa4, 0xdb, 0xf5, 0x4c, 0xb7, 0xef, 0x61, 0x5f, 0x7a, 0x9b, 0xd3, 0xeb, 0xff, 0xd1, 0x60, + 0xf2, 0x76, 0xab, 0xd1, 0x70, 0x36, 0x1d, 0x12, 0x24, 0x6f, 0x5b, 0x8b, 0x70, 0xd2, 0x55, 0x23, + 0xd2, 0xbb, 0x97, 0x7a, 0x98, 0x16, 0x21, 0x19, 0x6d, 0xd6, 0x6f, 0xb5, 0x4b, 0x67, 0x60, 0xaa, + 0xc3, 0x7a, 0xe9, 0xd1, 0x33, 0x30, 0x2c, 0x6e, 0x23, 0xe2, 0x08, 0x14, 0x0d, 0x7d, 0x0d, 0x9e, + 0x8d, 0x9d, 0xa4, 0xcb, 0xee, 0xa6, 0x57, 0x3f, 0x58, 0xc2, 0x61, 0x74, 0x8d, 0x16, 0xcf, 0x4e, + 0xb9, 0x41, 0x9f, 0x9d, 0xf4, 0xcf, 0x34, 0x98, 0x4c, 0x01, 0x2b, 0xc8, 0x0b, 0x30, 0x1e, 0x52, + 0x1c, 0x24, 0x73, 0xf0, 0xa5, 0x13, 0x46, 0x81, 0xf7, 0x8a, 0x0c, 0xfc, 0x81, 0xa6, 0x21, 0x1d, + 0x80, 0xb8, 0x76, 0xe2, 0xde, 0xb5, 0xa4, 0x19, 0x27, 0x89, 0x6b, 0x47, 0x34, 0xf5, 0x32, 0x14, + 0xcd, 0x38, 0x58, 0xbd, 0x08, 0x05, 0xb3, 0xcd, 0xa5, 0xff, 0x3b, 0x07, 0xe5, 0x94, 0x1a, 0xe8, + 0x19, 0x18, 0x49, 0x49, 0x96, 0x6d, 0x26, 0xf4, 0x90, 0xf6, 0xa6, 0x13, 0x99, 0xfc, 0x31, 0xbc, + 0x1d, 0xae, 0x43, 0xc1, 0x27, 0x01, 0xcb, 0x4a, 0xa8, 0xb3, 0x4b, 0xe4, 0xe5, 0x6e, 0x6e, 0xd0, + 0xbc, 0xaf, 0x8d, 0x60, 0xc4, 0xe1, 0xd0, 0x0d, 0x18, 0x62, 0x5b, 0x89, 0xe7, 0x02, 0x83, 0xa7, + 0x93, 0x6b, 0x0e, 0xd9, 0x33, 0x38, 0x40, 0xfd, 0x24, 0x8c, 0x2a, 0x6f, 0xff, 0x18, 0xa6, 0x3a, + 0xe6, 0xbc, 0x5d, 0x5e, 0xa3, 0xfb, 0xa6, 0xe3, 0x6e, 0x7a, 0x72, 0x4b, 0x5f, 0xec, 0xe3, 0x65, + 0x87, 0x23, 0x8c, 0xd0, 0x7d, 0xf6, 0x57, 0xc7, 0xf0, 0x5c, 0xc6, 0x4a, 0x3d, 0x36, 0x11, 0x1f, + 0x43, 0x51, 0x5e, 0xe4, 0x25, 0xe4, 0x07, 0x50, 0xe0, 0xe7, 0x62, 0xc0, 0x43, 0xcc, 0x61, 0xce, + 0x00, 0x70, 0xa3, 0xdf, 0xfa, 0x57, 0x2c, 0x36, 0xa5, 0xee, 0xa6, 0x4f, 0x42, 0x10, 0xba, 0x05, + 0xe3, 0x8e, 0x4d, 0x5c, 0xea, 0xd0, 0x03, 0x73, 0x87, 0x1c, 0xc8, 0xe5, 0x7c, 0xb9, 0x47, 0xd0, + 0x59, 0x96, 0x2c, 0x37, 0xc9, 0x81, 0x51, 0x70, 0xda, 0x0d, 0xfd, 0xbf, 0x79, 0x38, 0xdd, 0x45, + 0x64, 0xb7, 0xac, 0x41, 0x3b, 0x96, 0xac, 0xe1, 0xbb, 0x30, 0xc4, 0xcf, 0x5c, 0xa1, 0xf7, 0x8b, + 0xbd, 0x82, 0x34, 0xd3, 0x88, 0x33, 0x3c, 0x81, 0x7b, 0x7b, 0xe2, 0xd0, 0x18, 0x3a, 0xfc, 0xa1, + 0x71, 0x1e, 0x4a, 0x62, 0x93, 0x98, 0x56, 0x40, 0x30, 0x25, 0x36, 0xdf, 0x78, 0x43, 0x46, 0x51, + 0xf4, 0x5e, 0x17, 0x9d, 0x2c, 0x36, 0x4a, 0x32, 0x11, 0xab, 0x47, 0x54, 0x6c, 0x14, 0xbd, 0xbc, + 0x74, 0xc4, 0xc2, 0x54, 0x15, 0xc6, 0x7c, 0x2f, 0x74, 0x78, 0xac, 0x19, 0xe5, 0x40, 0x51, 0x1b, + 0xbd, 0x07, 0x23, 0xa1, 0xd7, 0x0a, 0x2c, 0x52, 0x19, 0xeb, 0xae, 0x6f, 0x32, 0x63, 0x64, 0xee, + 0x5b, 0xe5, 0xf4, 0x86, 0xe4, 0xe3, 0x51, 0x35, 0xae, 0x86, 0xfe, 0xf7, 0x3c, 0x40, 0xfb, 0xa8, + 0x7d, 0x62, 0x8f, 0x74, 0xe8, 0x5d, 0x79, 0xea, 0x8b, 0x89, 0x7f, 0x39, 0x85, 0x66, 0x93, 0xfd, + 0xe4, 0xc9, 0x1f, 0xfb, 0x00, 0x80, 0xb1, 0x25, 0xbc, 0x92, 0x4f, 0x79, 0xe5, 0xb8, 0x26, 0x72, + 0x05, 0x0a, 0xe2, 0xf5, 0x5e, 0xdc, 0x95, 0x87, 0xbb, 0x06, 0xfa, 0x84, 0xa6, 0x75, 0x4c, 0xad, + 0x6d, 0xa6, 0xae, 0x78, 0x33, 0xe6, 0xb7, 0x64, 0xf0, 0xa2, 0xdf, 0xe8, 0x72, 0x7b, 0x69, 0x34, + 0xb0, 0xd3, 0x24, 0x76, 0x34, 0xeb, 0x6a, 0x71, 0x88, 0x6e, 0x36, 0xef, 0xed, 0xb9, 0x1d, 0x3d, + 0xe4, 0xdc, 0x9e, 0x82, 0xb2, 0x99, 0x14, 0xa7, 0xff, 0x53, 0x83, 0xa9, 0x3b, 0x7b, 0x2e, 0xb1, + 0x57, 0xa4, 0xb3, 0x96, 0xed, 0x28, 0x69, 0xba, 0x07, 0x25, 0xe5, 0x42, 0x76, 0xd0, 0x46, 0x89, + 0xf0, 0x63, 0xe7, 0x46, 0xe1, 0xf0, 0xe9, 0x66, 0x76, 0xf8, 0xf1, 0x0e, 0x66, 0xc7, 0x1d, 0x18, + 0xa7, 0x01, 0xe6, 0x97, 0x58, 0x1f, 0x3b, 0x2a, 0x1d, 0xbb, 0xf8, 0x38, 0xd0, 0xbb, 0x82, 0x7e, + 0x05, 0x3b, 0xc1, 0x92, 0xc6, 0x4f, 0x4a, 0xd5, 0x64, 0x89, 0x00, 0x33, 0x2b, 0xa9, 0x28, 0x5f, + 0xc5, 0x71, 0x21, 0xba, 0x05, 0x95, 0x4e, 0x33, 0xa3, 0xa7, 0xcc, 0x42, 0xc4, 0x9e, 0xf9, 0x9d, + 0x4d, 0x57, 0x23, 0x97, 0x6d, 0x03, 0xfc, 0xe8, 0xf7, 0xec, 0x9f, 0x4e, 0xc3, 0x69, 0x76, 0x3a, + 0xae, 0x04, 0x1e, 0xf5, 0x2c, 0xaf, 0xb1, 0x4a, 0x82, 0x5d, 0xc7, 0x22, 0xe8, 0x3e, 0x8c, 0x88, + 0x84, 0x0c, 0x65, 0xbe, 0x1a, 0x24, 0xd2, 0xd5, 0xea, 0x85, 0x5e, 0x64, 0x52, 0xf3, 0x1d, 0x18, + 0x8f, 0x97, 0xbc, 0xd1, 0x2b, 0x8f, 0xe7, 0x4b, 0x94, 0xe8, 0xab, 0xaf, 0xf6, 0x47, 0x2c, 0x44, + 0x5d, 0xd1, 0xd0, 0x1a, 0x0c, 0xf3, 0x13, 0x0c, 0xbd, 0x94, 0xc5, 0x18, 0xaf, 0x84, 0x57, 0xcf, + 0xf7, 0xa0, 0x8a, 0x70, 0x3f, 0x81, 0x52, 0xf2, 0x64, 0x44, 0xaf, 0x3d, 0x96, 0x35, 0x5d, 0xdd, + 0xad, 0xd6, 0xfa, 0x25, 0x8f, 0x44, 0x7e, 0x04, 0xa3, 0xb2, 0x2a, 0x85, 0x32, 0x5d, 0x9d, 0x2c, + 0x9f, 0x56, 0x2f, 0xf6, 0xa4, 0x93, 0x73, 0x12, 0x44, 0x95, 0x43, 0x55, 0xf1, 0x42, 0xb5, 0x1e, + 0xbc, 0xa9, 0xd2, 0x5f, 0x75, 0xa6, 0x6f, 0x7a, 0x29, 0xf3, 0x43, 0x18, 0x11, 0x85, 0x94, 0xec, + 0x05, 0x96, 0x28, 0x8b, 0x65, 0x2f, 0xb0, 0x64, 0x3d, 0xe6, 0x8a, 0xc6, 0xcc, 0x49, 0xd5, 0x35, + 0xb2, 0xcd, 0xe9, 0x5e, 0x65, 0xc9, 0x36, 0x27, 0xab, 0xf6, 0xd2, 0x80, 0x62, 0xa2, 0x28, 0x82, + 0x32, 0x97, 0x6a, 0xb7, 0x9a, 0x4a, 0xf5, 0xb5, 0x3e, 0xa9, 0xa5, 0x34, 0x0f, 0x4a, 0xc9, 0xb7, + 0xfe, 0xec, 0xf5, 0xd7, 0xf5, 0x3b, 0x85, 0xec, 0xf5, 0x97, 0xf1, 0x09, 0x81, 0x07, 0xa5, 0xe4, + 0x23, 0x7d, 0xb6, 0xc0, 0xae, 0x1f, 0x0a, 0x64, 0x0b, 0xcc, 0x78, 0xfb, 0x6f, 0xc1, 0x44, 0xfa, + 0xed, 0x1b, 0x65, 0x4e, 0x4a, 0xc6, 0xdb, 0x7d, 0xf5, 0x4a, 0xff, 0x0c, 0x52, 0xac, 0x09, 0x63, + 0xea, 0x6d, 0x19, 0x65, 0x6e, 0x9f, 0xd4, 0xab, 0x79, 0xf5, 0x52, 0x6f, 0xc2, 0x68, 0x6d, 0xb6, + 0x60, 0x22, 0x5d, 0xc5, 0xc9, 0xb6, 0x2b, 0xa3, 0xfe, 0x95, 0x6d, 0x57, 0x66, 0x81, 0xa8, 0x05, + 0x13, 0xe9, 0xda, 0x45, 0xb6, 0xd8, 0x8c, 0xaa, 0x4f, 0xb6, 0xd8, 0xcc, 0xb2, 0x48, 0x00, 0xe5, + 0xd4, 0xfd, 0x3e, 0x7b, 0x27, 0x76, 0x2f, 0x83, 0x64, 0xef, 0xc4, 0xac, 0xc2, 0xc1, 0x67, 0x1a, + 0x9c, 0xed, 0x7a, 0xf3, 0x42, 0xd7, 0xfa, 0xbc, 0x60, 0x25, 0x4a, 0x0a, 0xd5, 0x37, 0x06, 0xe4, + 0x92, 0x6a, 0xd0, 0xce, 0x9b, 0x7c, 0xad, 0xdf, 0x0b, 0x5e, 0x2f, 0xd3, 0x33, 0x6e, 0xad, 0x57, + 0x34, 0xf4, 0x73, 0x40, 0x9d, 0x1f, 0x40, 0xa1, 0xab, 0x03, 0x7f, 0x96, 0x58, 0x9d, 0x1d, 0x84, + 0x45, 0x9a, 0xfc, 0xa9, 0x06, 0x67, 0xba, 0x7d, 0x14, 0x8c, 0x5e, 0xcf, 0xdc, 0x20, 0xd9, 0x9f, + 0x37, 0x57, 0xaf, 0x0d, 0xc6, 0x24, 0x75, 0xd8, 0x83, 0x89, 0x74, 0xd2, 0x94, 0xbd, 0xd0, 0x33, + 0xb2, 0xc8, 0xec, 0x85, 0x9e, 0x95, 0x8f, 0x5d, 0xd1, 0xd0, 0x3e, 0x9c, 0xea, 0xf8, 0x3a, 0x1c, + 0x65, 0x02, 0x65, 0x7d, 0x2a, 0x5f, 0xbd, 0x3a, 0x00, 0x87, 0x90, 0x3d, 0xeb, 0xb7, 0xbf, 0x26, + 0x51, 0xd9, 0xdb, 0xc7, 0x30, 0xa6, 0xba, 0xb2, 0xc3, 0x58, 0xea, 0x13, 0x94, 0xec, 0x30, 0x96, + 0xfe, 0xae, 0xa4, 0xfe, 0x79, 0xee, 0x2f, 0x0f, 0xa7, 0xb5, 0xaf, 0x1f, 0x4e, 0x6b, 0xdf, 0x3c, + 0x9c, 0xd6, 0xbe, 0x7c, 0x34, 0x7d, 0xe2, 0xeb, 0x47, 0xd3, 0x27, 0xfe, 0xf6, 0x68, 0xfa, 0x04, + 0x54, 0x2d, 0xaf, 0x99, 0x81, 0x53, 0x3f, 0x19, 0x25, 0x9a, 0x2b, 0xda, 0x47, 0x77, 0xb6, 0x1c, + 0xba, 0xdd, 0xda, 0xa8, 0x59, 0x5e, 0x73, 0xc6, 0xf2, 0xc2, 0xa6, 0x17, 0xce, 0x04, 0xa4, 0x81, + 0x0f, 0x48, 0x30, 0xb3, 0x3b, 0x1b, 0xfd, 0xe4, 0x17, 0x84, 0x70, 0xa6, 0xfb, 0x7f, 0x66, 0xbc, + 0xcd, 0x5a, 0xaa, 0xf1, 0xbb, 0x5c, 0x7e, 0x65, 0xed, 0x47, 0xbf, 0xcf, 0x4d, 0xae, 0x28, 0xe1, + 0x4c, 0x5a, 0x6d, 0x4d, 0x0e, 0xff, 0xb5, 0x3d, 0xb0, 0xce, 0x06, 0xd6, 0xd5, 0xc0, 0xc3, 0x9c, + 0xde, 0x7d, 0x60, 0xfd, 0xc6, 0x4a, 0x5d, 0xbd, 0xc7, 0xfc, 0x2b, 0x57, 0x51, 0x44, 0x73, 0x73, + 0x8c, 0x6a, 0x6e, 0x4e, 0x91, 0x6d, 0x8c, 0xf0, 0x7f, 0x80, 0x78, 0xfd, 0x7f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x8e, 0xb9, 0xe6, 0x1e, 0x3f, 0x32, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5060,6 +5124,22 @@ func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro dAtA[i] = 0xc2 } } + if len(m.SwapClaims) > 0 { + for iNdEx := len(m.SwapClaims) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.SwapClaims[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xfa + } + } if len(m.Swaps) > 0 { for iNdEx := len(m.Swaps) - 1; iNdEx >= 0; iNdEx-- { { @@ -5101,10 +5181,15 @@ func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro } } } - if len(m.Memo) > 0 { - i -= len(m.Memo) - copy(dAtA[i:], m.Memo) - i = encodeVarintView(dAtA, i, uint64(len(m.Memo))) + if m.Memo != nil { + { + size, err := m.Memo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x1a } @@ -5255,6 +5340,41 @@ func (m *TransactionPlannerRequest_Swap) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } +func (m *TransactionPlannerRequest_SwapClaim) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TransactionPlannerRequest_SwapClaim) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TransactionPlannerRequest_SwapClaim) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.SwapCommitment != nil { + { + size, err := m.SwapCommitment.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintView(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *TransactionPlannerRequest_Delegate) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7715,8 +7835,8 @@ func (m *TransactionPlannerRequest) Size() (n int) { l = m.Fee.Size() n += 1 + l + sovView(uint64(l)) } - l = len(m.Memo) - if l > 0 { + if m.Memo != nil { + l = m.Memo.Size() n += 1 + l + sovView(uint64(l)) } if m.XAccountGroupId != nil { @@ -7734,6 +7854,12 @@ func (m *TransactionPlannerRequest) Size() (n int) { n += 2 + l + sovView(uint64(l)) } } + if len(m.SwapClaims) > 0 { + for _, e := range m.SwapClaims { + l = e.Size() + n += 2 + l + sovView(uint64(l)) + } + } if len(m.Delegations) > 0 { for _, e := range m.Delegations { l = e.Size() @@ -7805,6 +7931,19 @@ func (m *TransactionPlannerRequest_Swap) Size() (n int) { return n } +func (m *TransactionPlannerRequest_SwapClaim) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.SwapCommitment != nil { + l = m.SwapCommitment.Size() + n += 1 + l + sovView(uint64(l)) + } + return n +} + func (m *TransactionPlannerRequest_Delegate) Size() (n int) { if m == nil { return 0 @@ -9261,7 +9400,7 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Memo", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -9271,23 +9410,27 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthView } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthView } if postIndex > l { return io.ErrUnexpectedEOF } - m.Memo = string(dAtA[iNdEx:postIndex]) + if m.Memo == nil { + m.Memo = &v1alpha1.MemoPlaintext{} + } + if err := m.Memo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 14: if wireType != 2 { @@ -9392,6 +9535,40 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 31: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SwapClaims", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowView + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthView + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthView + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SwapClaims = append(m.SwapClaims, &TransactionPlannerRequest_SwapClaim{}) + if err := m.SwapClaims[len(m.SwapClaims)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 40: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Delegations", wireType) @@ -9795,6 +9972,92 @@ func (m *TransactionPlannerRequest_Swap) Unmarshal(dAtA []byte) error { } return nil } +func (m *TransactionPlannerRequest_SwapClaim) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowView + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SwapClaim: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SwapClaim: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SwapCommitment", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowView + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthView + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthView + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.SwapCommitment == nil { + m.SwapCommitment = &v1alpha11.StateCommitment{} + } + if err := m.SwapCommitment.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipView(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthView + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *TransactionPlannerRequest_Delegate) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0