From c63ef6ee4f0aed5db1f3a85f423616f78a0fe0e9 Mon Sep 17 00:00:00 2001 From: mkXultra Date: Thu, 9 Mar 2023 17:04:32 +0900 Subject: [PATCH 1/2] modify: fix query --- docs/core/proto-docs.md | 8 +- proto/derivatives/query.proto | 16 +- x/derivatives/keeper/grpc_query.go | 8 +- x/derivatives/types/query.pb.go | 425 +++++++++++++++-------------- 4 files changed, 229 insertions(+), 228 deletions(-) diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md index 856a14b55..2cfc4802e 100644 --- a/docs/core/proto-docs.md +++ b/docs/core/proto-docs.md @@ -1919,8 +1919,8 @@ GenesisState defines the derivatives module's genesis state. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `amount` | [string](#string) | | | -| `fee` | [string](#string) | | | +| `amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | +| `fee` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | @@ -1951,8 +1951,8 @@ GenesisState defines the derivatives module's genesis state. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `amount` | [string](#string) | | | -| `fee` | [string](#string) | | | +| `amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | +| `fee` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | diff --git a/proto/derivatives/query.proto b/proto/derivatives/query.proto index b5818fd27..4151320ac 100644 --- a/proto/derivatives/query.proto +++ b/proto/derivatives/query.proto @@ -303,13 +303,13 @@ message QueryEstimateDLPTokenAmountRequest { } message QueryEstimateDLPTokenAmountResponse { - string amount = 1 [ + cosmos.base.v1beta1.Coin amount = 1 [ (gogoproto.moretags) = "yaml:\"amount\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" + (gogoproto.nullable) = false ]; - string fee = 2 [ + cosmos.base.v1beta1.Coin fee = 2 [ (gogoproto.moretags) = "yaml:\"fee\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" + (gogoproto.nullable) = false ]; } @@ -324,12 +324,12 @@ message QueryEstimateRedeemAmountRequest { } message QueryEstimateRedeemAmountResponse { - string amount = 1 [ + cosmos.base.v1beta1.Coin amount = 1 [ (gogoproto.moretags) = "yaml:\"amount\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" + (gogoproto.nullable) = false ]; - string fee = 2 [ + cosmos.base.v1beta1.Coin fee = 2 [ (gogoproto.moretags) = "yaml:\"fee\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" + (gogoproto.nullable) = false ]; } diff --git a/x/derivatives/keeper/grpc_query.go b/x/derivatives/keeper/grpc_query.go index 9b4919a85..fe26c780f 100644 --- a/x/derivatives/keeper/grpc_query.go +++ b/x/derivatives/keeper/grpc_query.go @@ -312,8 +312,8 @@ func (k Keeper) EstimateDLPTokenAmount(c context.Context, req *types.QueryEstima } return &types.QueryEstimateDLPTokenAmountResponse{ - Amount: &mintAmount.Amount, - Fee: &mintFee.Amount, + Amount: mintAmount, + Fee: mintFee, }, nil } @@ -329,8 +329,8 @@ func (k Keeper) EstimateRedeemAmount(c context.Context, req *types.QueryEstimate } return &types.QueryEstimateRedeemAmountResponse{ - Amount: &redeemAmount.Amount, - Fee: &redeemFee.Amount, + Amount: redeemAmount, + Fee: redeemFee, }, nil } diff --git a/x/derivatives/types/query.pb.go b/x/derivatives/types/query.pb.go index 2e3731ddf..676519c62 100644 --- a/x/derivatives/types/query.pb.go +++ b/x/derivatives/types/query.pb.go @@ -1287,8 +1287,8 @@ func (m *QueryEstimateDLPTokenAmountRequest) GetMintDenom() string { } type QueryEstimateDLPTokenAmountResponse struct { - Amount *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount,omitempty" yaml:"amount"` - Fee *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=fee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"fee,omitempty" yaml:"fee"` + Amount types.Coin `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount" yaml:"amount"` + Fee types.Coin `protobuf:"bytes,2,opt,name=fee,proto3" json:"fee" yaml:"fee"` } func (m *QueryEstimateDLPTokenAmountResponse) Reset() { *m = QueryEstimateDLPTokenAmountResponse{} } @@ -1324,6 +1324,20 @@ func (m *QueryEstimateDLPTokenAmountResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryEstimateDLPTokenAmountResponse proto.InternalMessageInfo +func (m *QueryEstimateDLPTokenAmountResponse) GetAmount() types.Coin { + if m != nil { + return m.Amount + } + return types.Coin{} +} + +func (m *QueryEstimateDLPTokenAmountResponse) GetFee() types.Coin { + if m != nil { + return m.Fee + } + return types.Coin{} +} + type QueryEstimateRedeemAmountRequest struct { RedeemDenom string `protobuf:"bytes,1,opt,name=redeem_denom,json=redeemDenom,proto3" json:"redeem_denom,omitempty" yaml:"redeem_denom"` LptAmount *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=lpt_amount,json=lptAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"lpt_amount,omitempty" yaml:"lpt_amount"` @@ -1370,8 +1384,8 @@ func (m *QueryEstimateRedeemAmountRequest) GetRedeemDenom() string { } type QueryEstimateRedeemAmountResponse struct { - Amount *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=amount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"amount,omitempty" yaml:"amount"` - Fee *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=fee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"fee,omitempty" yaml:"fee"` + Amount types.Coin `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount" yaml:"amount"` + Fee types.Coin `protobuf:"bytes,2,opt,name=fee,proto3" json:"fee" yaml:"fee"` } func (m *QueryEstimateRedeemAmountResponse) Reset() { *m = QueryEstimateRedeemAmountResponse{} } @@ -1407,6 +1421,20 @@ func (m *QueryEstimateRedeemAmountResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryEstimateRedeemAmountResponse proto.InternalMessageInfo +func (m *QueryEstimateRedeemAmountResponse) GetAmount() types.Coin { + if m != nil { + return m.Amount + } + return types.Coin{} +} + +func (m *QueryEstimateRedeemAmountResponse) GetFee() types.Coin { + if m != nil { + return m.Fee + } + return types.Coin{} +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "ununifi.derivatives.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "ununifi.derivatives.QueryParamsResponse") @@ -1443,131 +1471,132 @@ func init() { func init() { proto.RegisterFile("derivatives/query.proto", fileDescriptor_2e622b2562178c0b) } var fileDescriptor_2e622b2562178c0b = []byte{ - // 1982 bytes of a gzipped FileDescriptorProto + // 1992 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4d, 0x6c, 0x1c, 0x49, - 0x15, 0x4e, 0xdb, 0x8e, 0x59, 0x3f, 0xdb, 0xb1, 0xb7, 0xe2, 0xbf, 0x4c, 0xe2, 0x19, 0xa7, 0xc2, - 0x7a, 0xbd, 0x21, 0x33, 0xbd, 0x71, 0x42, 0x92, 0x0d, 0xec, 0xae, 0xec, 0x84, 0x40, 0x56, 0x09, - 0x4c, 0x7a, 0x93, 0x03, 0x08, 0x31, 0xb4, 0xa7, 0x6b, 0xc6, 0x4d, 0xba, 0xbb, 0x3a, 0xdd, 0x3d, - 0x96, 0x67, 0x2d, 0x23, 0xc4, 0x89, 0x23, 0xd2, 0xf2, 0x73, 0x84, 0x0b, 0x48, 0x2b, 0x0e, 0xdc, - 0xf7, 0xc0, 0x01, 0x56, 0xab, 0x1c, 0x57, 0x42, 0x42, 0x08, 0xa4, 0x11, 0x4a, 0x90, 0x38, 0x33, - 0x17, 0xae, 0xa8, 0xab, 0x5e, 0xcf, 0x74, 0x8f, 0x7b, 0x7a, 0x66, 0x0c, 0x08, 0x02, 0x9c, 0x3c, - 0x55, 0xef, 0xef, 0x7b, 0xf5, 0x5e, 0xbd, 0x7e, 0xaf, 0x0c, 0xcb, 0x06, 0xf3, 0xcc, 0x3d, 0x3d, - 0x30, 0xf7, 0x98, 0xaf, 0x3e, 0x69, 0x30, 0xaf, 0x59, 0x72, 0x3d, 0x1e, 0x70, 0x72, 0xba, 0xe1, - 0x34, 0x1c, 0xb3, 0x66, 0x96, 0x62, 0x0c, 0xb9, 0x85, 0x3a, 0xaf, 0x73, 0x41, 0x57, 0xc3, 0x5f, - 0x92, 0x35, 0x77, 0xae, 0xce, 0x79, 0xdd, 0x62, 0xaa, 0xee, 0x9a, 0xaa, 0xee, 0x38, 0x3c, 0xd0, - 0x03, 0x93, 0x3b, 0x3e, 0x52, 0x2f, 0x56, 0xb9, 0x6f, 0x73, 0x5f, 0xdd, 0xd1, 0x7d, 0x26, 0x2d, - 0xa8, 0x7b, 0x97, 0x77, 0x58, 0xa0, 0x5f, 0x56, 0x5d, 0xbd, 0x6e, 0x3a, 0x82, 0x19, 0x79, 0xf3, - 0x71, 0xde, 0x88, 0xab, 0xca, 0xcd, 0x88, 0x7e, 0x46, 0xd2, 0x2b, 0x12, 0x82, 0x5c, 0x20, 0x69, - 0x35, 0xee, 0x48, 0xec, 0x37, 0x92, 0x57, 0xe2, 0x64, 0x57, 0xf7, 0x74, 0x1b, 0x29, 0x74, 0x01, - 0xc8, 0x83, 0x10, 0x55, 0x59, 0x6c, 0x6a, 0xec, 0x49, 0x83, 0xf9, 0x01, 0x2d, 0xc3, 0xe9, 0xc4, - 0xae, 0xef, 0x72, 0xc7, 0x67, 0xe4, 0x0d, 0x98, 0x94, 0xc2, 0x2b, 0xca, 0x9a, 0xb2, 0x31, 0xbd, - 0x79, 0xb6, 0x94, 0x72, 0x4c, 0x25, 0x29, 0xb4, 0x3d, 0xf1, 0xb4, 0x55, 0x38, 0xa1, 0xa1, 0x00, - 0x25, 0x30, 0x2f, 0x35, 0x72, 0x6e, 0x45, 0x56, 0x7e, 0x3a, 0x0e, 0x2f, 0xc7, 0x36, 0xd1, 0xc8, - 0x03, 0x58, 0xb0, 0x59, 0xe0, 0x99, 0x55, 0xbf, 0xf2, 0xa4, 0xc1, 0x03, 0x56, 0x09, 0xcc, 0xea, - 0x63, 0xe6, 0x09, 0x93, 0x53, 0xdb, 0x85, 0x76, 0xab, 0x70, 0xb6, 0xa9, 0xdb, 0xd6, 0x4d, 0x9a, - 0xc6, 0x45, 0x35, 0x82, 0xdb, 0x0f, 0xc2, 0xdd, 0x87, 0x62, 0x93, 0xd4, 0x60, 0xce, 0xe5, 0xdc, - 0xaa, 0xd8, 0xba, 0xf7, 0x98, 0x05, 0x95, 0xaa, 0xee, 0xae, 0x8c, 0x09, 0x07, 0x68, 0xba, 0x03, - 0x9c, 0x5b, 0xf7, 0x05, 0xeb, 0x2d, 0xdd, 0xdd, 0xce, 0xb5, 0x5b, 0x85, 0x25, 0x69, 0xb1, 0x47, - 0x09, 0xd5, 0x66, 0xdd, 0x38, 0x2b, 0xf9, 0x16, 0x9c, 0xda, 0xe3, 0x56, 0xc3, 0x66, 0x95, 0xcd, - 0xab, 0xbb, 0xbc, 0xe1, 0xf9, 0x2b, 0xe3, 0x02, 0xf4, 0xad, 0x3f, 0xb4, 0x0a, 0xeb, 0x75, 0x33, - 0xd8, 0x6d, 0xec, 0x94, 0xaa, 0xdc, 0xc6, 0xd0, 0xe1, 0x9f, 0xa2, 0x6f, 0x3c, 0x56, 0x83, 0xa6, - 0xcb, 0xfc, 0xd2, 0x6d, 0x56, 0x6d, 0xb7, 0x0a, 0x8b, 0xd2, 0x58, 0x52, 0x13, 0xd5, 0x66, 0xe5, - 0x06, 0xae, 0x89, 0x01, 0x33, 0x35, 0xc6, 0xfc, 0x8e, 0xa5, 0x09, 0x61, 0x69, 0x6b, 0x24, 0x4b, - 0xa7, 0xa5, 0xa5, 0xb8, 0x1e, 0xaa, 0x4d, 0x87, 0xcb, 0x68, 0xf5, 0x73, 0x05, 0x5e, 0x13, 0x21, - 0xba, 0x67, 0x3e, 0x69, 0x98, 0x86, 0x19, 0x34, 0xcb, 0x1e, 0xdf, 0x33, 0x0d, 0xe6, 0x3d, 0xe4, - 0x8f, 0x99, 0xa3, 0x31, 0xdd, 0xda, 0x2a, 0x7f, 0x15, 0x03, 0x4a, 0xde, 0x84, 0xd9, 0x1d, 0x56, - 0xe3, 0x1e, 0xab, 0xec, 0x32, 0xb3, 0xbe, 0x1b, 0x88, 0x98, 0x8d, 0x6f, 0xaf, 0xb4, 0x5b, 0x85, - 0x05, 0x69, 0x2a, 0x41, 0xa6, 0xda, 0x8c, 0x5c, 0x7f, 0x49, 0x2c, 0xc9, 0x4d, 0x98, 0xd1, 0x6b, - 0x01, 0xf3, 0x22, 0xe9, 0x31, 0x21, 0xbd, 0xdc, 0x05, 0x1a, 0xa7, 0x52, 0x6d, 0x5a, 0x2c, 0xa5, - 0x2c, 0xdd, 0x87, 0x8b, 0xc3, 0xe0, 0xc4, 0x1c, 0x7b, 0x07, 0xc6, 0x75, 0xb7, 0x89, 0x29, 0x75, - 0x63, 0xa4, 0x33, 0x03, 0x84, 0xe2, 0x36, 0xa9, 0x16, 0x2a, 0xa1, 0x1f, 0x28, 0x70, 0x29, 0xc3, - 0xf4, 0x97, 0xb9, 0x6d, 0x3a, 0xff, 0x29, 0xa7, 0x74, 0x00, 0xc5, 0x21, 0xa1, 0xfe, 0x0b, 0x0e, - 0x2a, 0x0f, 0xe7, 0xe4, 0x6d, 0x67, 0x9e, 0xcb, 0x82, 0x86, 0x6e, 0xdd, 0x69, 0x04, 0x0d, 0x8f, - 0x75, 0x8a, 0xce, 0x4f, 0x26, 0x60, 0xb5, 0x0f, 0xc3, 0x80, 0xd2, 0x30, 0x76, 0xfc, 0xd2, 0xf0, - 0x5f, 0x77, 0x65, 0x43, 0x8f, 0x2c, 0xee, 0xd4, 0x2b, 0x2e, 0xf7, 0x4d, 0xf1, 0x25, 0x5a, 0x39, - 0x79, 0x7c, 0x8f, 0x92, 0x9a, 0xa8, 0x36, 0x1b, 0x6e, 0x94, 0xa3, 0x35, 0xb1, 0x61, 0xce, 0xdf, - 0xe5, 0x5e, 0x10, 0x33, 0x36, 0x29, 0x8c, 0xdd, 0x1e, 0xc9, 0x18, 0x96, 0xd7, 0x1e, 0x55, 0x54, - 0x3b, 0x25, 0x76, 0x3a, 0xe6, 0xe8, 0xfb, 0x0a, 0xd0, 0xd4, 0x0c, 0x91, 0x25, 0x38, 0xba, 0x60, - 0x57, 0x01, 0xc2, 0x4f, 0x68, 0xc5, 0x60, 0x0e, 0xb7, 0x31, 0x77, 0x17, 0xdb, 0xad, 0xc2, 0xcb, - 0x78, 0xbb, 0x3a, 0x34, 0xaa, 0x4d, 0x85, 0x8b, 0xdb, 0xe1, 0x6f, 0x72, 0x1d, 0xa6, 0x65, 0xba, - 0x48, 0x31, 0x99, 0x53, 0x4b, 0xed, 0x56, 0x81, 0x48, 0xb1, 0x18, 0x91, 0x6a, 0x20, 0x56, 0x42, - 0x90, 0xfe, 0x6d, 0x02, 0x2e, 0x64, 0xa2, 0xc2, 0xec, 0x2d, 0xc3, 0x49, 0xd7, 0x33, 0xab, 0x0c, - 0x11, 0xdd, 0x1c, 0xe9, 0x88, 0x66, 0xf0, 0x0b, 0x14, 0x2a, 0xa0, 0x9a, 0x54, 0xf4, 0xff, 0xfb, - 0xf0, 0x3f, 0x7e, 0x1f, 0x8e, 0x54, 0xd4, 0xaf, 0xb8, 0x82, 0x10, 0x55, 0xd4, 0x42, 0x6f, 0x41, - 0xed, 0xd0, 0x65, 0x4a, 0xa6, 0x5c, 0x28, 0xe4, 0xf8, 0xb7, 0x5e, 0xa8, 0x57, 0x7a, 0xef, 0x53, - 0x0f, 0x28, 0x04, 0xbf, 0x03, 0x2b, 0x82, 0x6d, 0xcb, 0xb2, 0x3a, 0x47, 0x12, 0x21, 0xbe, 0x03, - 0xd0, 0x6d, 0xaf, 0xb1, 0x5b, 0x5d, 0x2f, 0x61, 0xcb, 0x1c, 0x42, 0x2c, 0xc9, 0x6e, 0x1f, 0xbb, - 0xec, 0x52, 0x59, 0xaf, 0x33, 0x94, 0xd5, 0x62, 0x92, 0xf4, 0xd7, 0x0a, 0x9c, 0x49, 0x31, 0x82, - 0x37, 0xfa, 0xeb, 0x30, 0xd5, 0x0d, 0xb4, 0xb2, 0x36, 0xbe, 0x31, 0xbd, 0xf9, 0xe9, 0xd4, 0x8e, - 0x32, 0x54, 0x61, 0x32, 0x23, 0xd2, 0xb0, 0xbd, 0x12, 0xf6, 0xc6, 0xed, 0x56, 0x61, 0x3e, 0xea, - 0x2b, 0x3b, 0x21, 0xee, 0x2a, 0x24, 0x5f, 0x4c, 0xf8, 0x20, 0x1b, 0xd6, 0x57, 0x07, 0xfa, 0x20, - 0xa1, 0x25, 0x9c, 0xb8, 0x0e, 0x0b, 0xd8, 0x66, 0x4b, 0xd5, 0xd1, 0x21, 0x15, 0x60, 0x3a, 0xb2, - 0x56, 0x31, 0x0d, 0x19, 0x57, 0x0d, 0xa2, 0xad, 0xbb, 0x06, 0xfd, 0x68, 0x1c, 0x16, 0x7b, 0x24, - 0xd1, 0x73, 0x0d, 0x5e, 0x8a, 0xf8, 0xf0, 0x74, 0x57, 0xfb, 0xb4, 0xd2, 0xe8, 0xf1, 0xf2, 0xd3, - 0x56, 0x41, 0x69, 0xb7, 0x0a, 0x73, 0x49, 0x8f, 0xa9, 0xd6, 0xd1, 0x43, 0x18, 0xcc, 0xef, 0xe9, - 0x56, 0x43, 0x60, 0x0e, 0x67, 0x9c, 0x9a, 0x19, 0xa0, 0xd7, 0x67, 0x12, 0x5e, 0x47, 0xfe, 0xde, - 0xe2, 0xa6, 0xb3, 0x5d, 0xc0, 0x93, 0x5c, 0xc6, 0x8a, 0xd3, 0xa3, 0x80, 0x6a, 0x73, 0x9d, 0xad, - 0xb2, 0xd8, 0x21, 0xdf, 0x53, 0x60, 0xd9, 0xd6, 0xbd, 0xba, 0xe9, 0x54, 0x6c, 0xdd, 0x74, 0x02, - 0xe6, 0xe8, 0x4e, 0x95, 0x55, 0x3c, 0x3d, 0x60, 0x58, 0xeb, 0xca, 0xa1, 0xce, 0x91, 0x2e, 0x6c, - 0x1e, 0xcb, 0x6c, 0xba, 0x5a, 0xaa, 0x2d, 0x4a, 0xca, 0xfd, 0x2e, 0x41, 0xd3, 0x03, 0x16, 0x7a, - 0xcc, 0x6a, 0x35, 0x56, 0x0d, 0xcf, 0xaa, 0x22, 0x59, 0x44, 0x11, 0x1c, 0xc5, 0xe3, 0x5e, 0x05, - 0x54, 0x9b, 0xeb, 0x6c, 0xdd, 0x97, 0x3b, 0x1f, 0x2a, 0xb0, 0x91, 0xfa, 0x81, 0x8a, 0xa2, 0xf3, - 0xae, 0xf9, 0x5e, 0x94, 0xfd, 0xe4, 0x9b, 0x30, 0xdb, 0x49, 0x8a, 0xd0, 0x45, 0x11, 0xde, 0x53, - 0x9b, 0xe7, 0x33, 0xc3, 0xfb, 0xb0, 0xe9, 0xb2, 0x78, 0x03, 0x9b, 0xd0, 0x40, 0xb5, 0x19, 0x37, - 0xc6, 0x47, 0x2e, 0xc1, 0xa7, 0x74, 0xc3, 0xf0, 0x98, 0xef, 0x63, 0x4d, 0x20, 0xed, 0x56, 0xe1, - 0x14, 0x76, 0x8b, 0x92, 0x40, 0xb5, 0x88, 0x85, 0xfe, 0x2c, 0x9a, 0x40, 0xb2, 0xc1, 0x63, 0x5e, - 0xee, 0xc3, 0x72, 0xc0, 0x03, 0xdd, 0xea, 0x54, 0xcd, 0x8a, 0x6f, 0xbe, 0xc7, 0x2a, 0x0d, 0xdf, - 0xc0, 0x34, 0xcd, 0x38, 0xd8, 0x75, 0x3c, 0x58, 0x0c, 0x66, 0x8f, 0x9e, 0x86, 0x6f, 0x08, 0x5d, - 0x54, 0x5b, 0x10, 0x94, 0xb8, 0xf9, 0x47, 0xbe, 0x41, 0x7f, 0xa0, 0x60, 0x31, 0xde, 0x92, 0xc0, - 0x8f, 0x94, 0xa4, 0x98, 0xdb, 0xca, 0x40, 0xb7, 0x7b, 0x0a, 0xd8, 0xd8, 0xb1, 0x0b, 0xd8, 0xc7, - 0x0a, 0x7e, 0x03, 0x8e, 0xc2, 0x7a, 0xb1, 0x8a, 0x58, 0x0e, 0xab, 0xfd, 0xed, 0x7b, 0x65, 0x39, - 0xd2, 0xe9, 0x41, 0xe4, 0x30, 0xfd, 0x36, 0x16, 0xe9, 0x24, 0x0d, 0xfd, 0x5b, 0x82, 0x49, 0xbf, - 0x69, 0xef, 0x70, 0x0b, 0x0b, 0x1c, 0xae, 0xc8, 0x5d, 0x38, 0x19, 0x5e, 0xce, 0x30, 0x09, 0xc7, - 0xb3, 0x13, 0xa3, 0xc7, 0x51, 0xc3, 0x72, 0xc5, 0xb5, 0xf6, 0xa9, 0x26, 0x35, 0xd0, 0x5f, 0x46, - 0x9f, 0xd1, 0x2f, 0xf8, 0x81, 0x69, 0xeb, 0x01, 0x8b, 0x80, 0x6c, 0xd9, 0xbc, 0xe1, 0xc4, 0x3f, - 0xa3, 0xb6, 0xe9, 0x04, 0xfd, 0x3e, 0xa3, 0x5d, 0x1a, 0xd5, 0xa6, 0xc2, 0x85, 0xfc, 0x8c, 0xbe, - 0x0b, 0x93, 0xba, 0x50, 0x83, 0xb7, 0xe5, 0x73, 0x43, 0x56, 0xa6, 0xbb, 0x4e, 0xd0, 0x6e, 0x15, - 0x66, 0x31, 0xc1, 0x84, 0x06, 0xaa, 0xa1, 0xaa, 0x30, 0x2d, 0x2e, 0x64, 0x22, 0xc6, 0xc3, 0xeb, - 0x1a, 0x57, 0xfe, 0x69, 0xc6, 0xc3, 0xa1, 0xb2, 0xc6, 0x18, 0xba, 0x73, 0x63, 0x24, 0x8d, 0xd0, - 0x69, 0xf7, 0xa8, 0x16, 0x2a, 0xa1, 0xbf, 0x52, 0x60, 0x2d, 0xe1, 0x88, 0xc6, 0x0c, 0xc6, 0xec, - 0xe4, 0xc1, 0xdf, 0x84, 0x19, 0x4f, 0x6c, 0x27, 0x8e, 0x3e, 0x36, 0x32, 0xc7, 0xa9, 0x54, 0x9b, - 0x96, 0x4b, 0x79, 0xfc, 0xdf, 0x00, 0xb0, 0xdc, 0xa0, 0x92, 0x08, 0xc1, 0xdb, 0x23, 0x61, 0xc6, - 0xf0, 0x76, 0xb5, 0x50, 0x6d, 0xca, 0x72, 0x03, 0x09, 0x91, 0x7e, 0xa4, 0xc0, 0xf9, 0x0c, 0x07, - 0x5e, 0x90, 0x38, 0x6c, 0x7e, 0xbc, 0x08, 0x27, 0x85, 0x1b, 0xe4, 0x3b, 0x0a, 0x4c, 0xca, 0x27, - 0x40, 0xf2, 0x6a, 0xdf, 0x3a, 0x92, 0x7c, 0x6f, 0xcc, 0x6d, 0x0c, 0x66, 0xc4, 0xa6, 0xef, 0xc2, - 0x77, 0x7f, 0xfb, 0xe7, 0xf7, 0xc7, 0x56, 0xc9, 0x59, 0x15, 0x25, 0xd4, 0xa3, 0x4f, 0x9b, 0x64, - 0x1f, 0x26, 0xca, 0x9c, 0x5b, 0xe4, 0x95, 0x0c, 0xb5, 0xdd, 0x77, 0xc8, 0xdc, 0xfa, 0x20, 0x36, - 0xb4, 0x7d, 0x5e, 0xd8, 0x3e, 0x4b, 0xce, 0xa4, 0xdb, 0x0e, 0x2d, 0xfe, 0x51, 0x81, 0xd5, 0xcc, - 0x27, 0x28, 0xf2, 0x56, 0x7f, 0x63, 0xc3, 0xbc, 0xb1, 0xe5, 0xde, 0x3e, 0xb6, 0x3c, 0x7a, 0xf1, - 0x86, 0xf0, 0xe2, 0x0a, 0xb9, 0x9c, 0xea, 0x85, 0x15, 0xe9, 0x28, 0xba, 0xa8, 0xc4, 0x57, 0x3d, - 0xa6, 0x5b, 0x45, 0xdd, 0x6d, 0x92, 0xbf, 0x28, 0xb0, 0x36, 0xe8, 0xe9, 0x88, 0x6c, 0x8d, 0x0a, - 0xf0, 0xc8, 0x0b, 0x59, 0x6e, 0xfb, 0x1f, 0x51, 0x81, 0x6e, 0x7e, 0x5e, 0xb8, 0x79, 0x8d, 0x5c, - 0x1d, 0xda, 0x4d, 0x47, 0x2a, 0x11, 0x9e, 0x7e, 0xa0, 0xc0, 0x7c, 0x6f, 0xc3, 0x41, 0x2e, 0x67, - 0xe4, 0x49, 0xfa, 0x9b, 0x56, 0x6e, 0x73, 0x14, 0x11, 0x44, 0x5e, 0x12, 0xc8, 0x37, 0xc8, 0x7a, - 0x7a, 0x9a, 0x45, 0x62, 0xc5, 0x1a, 0xc2, 0xfa, 0x9d, 0x02, 0x4b, 0xe9, 0x4f, 0x0f, 0xe4, 0xfa, - 0xf0, 0xe6, 0x13, 0x13, 0x5f, 0xee, 0xc6, 0xe8, 0x82, 0x88, 0xfe, 0xae, 0x40, 0x7f, 0x8b, 0x6c, - 0x0d, 0x87, 0x5e, 0x3d, 0xe8, 0x4e, 0x8f, 0x87, 0xea, 0x41, 0x6c, 0x26, 0x3c, 0x4c, 0x06, 0x01, - 0x67, 0xc0, 0xa1, 0x82, 0x90, 0x1c, 0x83, 0x87, 0x0a, 0x42, 0xef, 0x64, 0x3c, 0x6c, 0x10, 0x38, - 0xc2, 0x4a, 0x04, 0x21, 0x31, 0xaf, 0x0e, 0x15, 0x84, 0xb4, 0xb1, 0x7b, 0xa8, 0x20, 0xa4, 0x8f, - 0xc6, 0xc3, 0x06, 0x01, 0xd1, 0x67, 0x05, 0xe1, 0x87, 0x0a, 0xcc, 0xc4, 0x87, 0x5f, 0x52, 0xec, - 0x8f, 0x2a, 0x65, 0x12, 0xcf, 0x95, 0x86, 0x65, 0x47, 0xe8, 0xeb, 0x02, 0xfa, 0x1a, 0xc9, 0xf7, - 0x29, 0xb2, 0x11, 0x8c, 0x1f, 0x2b, 0xf0, 0x52, 0x24, 0x4d, 0x5e, 0xcb, 0xaa, 0xe0, 0x89, 0xa1, - 0x37, 0x77, 0x71, 0x18, 0x56, 0xc4, 0x72, 0x55, 0x60, 0x29, 0x91, 0x4b, 0xd9, 0x58, 0xd4, 0x83, - 0xd8, 0x18, 0x7d, 0x48, 0xfe, 0xaa, 0xc0, 0xb9, 0xac, 0x61, 0x85, 0xbc, 0x39, 0xfc, 0xe5, 0x4a, - 0x99, 0xd0, 0x72, 0x6f, 0x1d, 0x57, 0x1c, 0xbd, 0xd2, 0x84, 0x57, 0xf7, 0xc8, 0x3b, 0x03, 0xbc, - 0x4a, 0xb9, 0xab, 0x89, 0xb9, 0xee, 0x50, 0x3d, 0xc0, 0x69, 0xe5, 0x90, 0xfc, 0x42, 0x81, 0xf9, - 0xde, 0x09, 0x23, 0xeb, 0xaa, 0xf6, 0x19, 0x92, 0xb2, 0xae, 0x6a, 0xbf, 0x01, 0x86, 0xbe, 0x2e, - 0xfc, 0xb9, 0x48, 0x36, 0x52, 0xfd, 0xe9, 0x60, 0x8c, 0xe5, 0xce, 0x8f, 0x14, 0x98, 0x8d, 0xcf, - 0x0a, 0x99, 0x49, 0x9d, 0x32, 0x70, 0x64, 0x25, 0x75, 0xda, 0x0c, 0x32, 0x30, 0xa9, 0xb9, 0xe5, - 0xab, 0x86, 0xe5, 0x92, 0xdf, 0x28, 0xb0, 0x94, 0xde, 0x91, 0x67, 0x55, 0x91, 0xcc, 0xa9, 0x23, - 0xab, 0x8a, 0x64, 0x37, 0xff, 0xf4, 0x9a, 0x40, 0xfd, 0x3a, 0x29, 0xa5, 0xa2, 0x66, 0x28, 0x5c, - 0x34, 0x2c, 0xb7, 0x18, 0x84, 0xe2, 0x45, 0xec, 0x2b, 0x3f, 0x54, 0x60, 0x21, 0xad, 0x9b, 0x25, - 0x9f, 0x1d, 0x0c, 0x25, 0xa5, 0x7d, 0xcf, 0x5d, 0x1b, 0x55, 0x0c, 0xf1, 0x5f, 0x11, 0xf8, 0x8b, - 0xe4, 0x33, 0xd9, 0xf8, 0x65, 0xb7, 0x8f, 0xe0, 0xb7, 0xef, 0x3c, 0x7d, 0x96, 0x57, 0x3e, 0x79, - 0x96, 0x57, 0xfe, 0xf4, 0x2c, 0xaf, 0x7c, 0xff, 0x79, 0xfe, 0xc4, 0x27, 0xcf, 0xf3, 0x27, 0x7e, - 0xff, 0x3c, 0x7f, 0xe2, 0x6b, 0x97, 0x62, 0xdd, 0xf1, 0x23, 0xe7, 0x91, 0x63, 0xde, 0x31, 0xd5, - 0xea, 0xae, 0x6e, 0x3a, 0xea, 0x7e, 0x42, 0xb1, 0xe8, 0x93, 0x77, 0x26, 0xc5, 0xff, 0xd7, 0xaf, - 0xfc, 0x3d, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x60, 0xe3, 0xb9, 0x63, 0x20, 0x00, 0x00, + 0x15, 0x4e, 0xdb, 0x8e, 0x59, 0x3f, 0xdb, 0xb1, 0xb7, 0xe2, 0xbf, 0x4c, 0xe2, 0x19, 0xa7, 0x96, + 0xf5, 0x7a, 0x43, 0x66, 0x7a, 0xe3, 0x84, 0x64, 0x37, 0xb0, 0x1b, 0xd9, 0x09, 0x61, 0xb3, 0x4a, + 0x60, 0xd2, 0x9b, 0x1c, 0x40, 0x88, 0xa1, 0x3d, 0x5d, 0x33, 0x6e, 0xd2, 0xdd, 0xd5, 0xe9, 0xee, + 0xb1, 0x3c, 0x6b, 0x19, 0x21, 0x4e, 0x1c, 0x91, 0x96, 0x9f, 0x23, 0x5c, 0x40, 0x5a, 0x21, 0x01, + 0xe7, 0x3d, 0x70, 0x00, 0xb4, 0xca, 0x71, 0x25, 0x24, 0x84, 0x40, 0x1a, 0xa1, 0x04, 0x89, 0x33, + 0x73, 0xe1, 0x8a, 0xba, 0xea, 0xf5, 0x4c, 0xf7, 0xb8, 0xa7, 0x67, 0xc6, 0x08, 0x11, 0x60, 0x4f, + 0x9e, 0xaa, 0x57, 0xef, 0xbd, 0xef, 0xfd, 0xd4, 0xeb, 0xf7, 0xca, 0xb0, 0x6c, 0x30, 0xcf, 0xdc, + 0xd3, 0x03, 0x73, 0x8f, 0xf9, 0xea, 0xe3, 0x06, 0xf3, 0x9a, 0x25, 0xd7, 0xe3, 0x01, 0x27, 0xa7, + 0x1b, 0x4e, 0xc3, 0x31, 0x6b, 0x66, 0x29, 0x76, 0x20, 0xb7, 0x50, 0xe7, 0x75, 0x2e, 0xe8, 0x6a, + 0xf8, 0x4b, 0x1e, 0xcd, 0x9d, 0xab, 0x73, 0x5e, 0xb7, 0x98, 0xaa, 0xbb, 0xa6, 0xaa, 0x3b, 0x0e, + 0x0f, 0xf4, 0xc0, 0xe4, 0x8e, 0x8f, 0xd4, 0x0b, 0x55, 0xee, 0xdb, 0xdc, 0x57, 0x77, 0x74, 0x9f, + 0x49, 0x0d, 0xea, 0xde, 0xa5, 0x1d, 0x16, 0xe8, 0x97, 0x54, 0x57, 0xaf, 0x9b, 0x8e, 0x38, 0x8c, + 0x67, 0xf3, 0xf1, 0xb3, 0xd1, 0xa9, 0x2a, 0x37, 0x23, 0xfa, 0x19, 0x49, 0xaf, 0x48, 0x08, 0x72, + 0x81, 0xa4, 0xd5, 0xb8, 0x21, 0xb1, 0xdf, 0x48, 0x5e, 0x89, 0x93, 0x5d, 0xdd, 0xd3, 0x6d, 0xa4, + 0xd0, 0x05, 0x20, 0xf7, 0x43, 0x54, 0x65, 0xb1, 0xa9, 0xb1, 0xc7, 0x0d, 0xe6, 0x07, 0xb4, 0x0c, + 0xa7, 0x13, 0xbb, 0xbe, 0xcb, 0x1d, 0x9f, 0x91, 0x37, 0x60, 0x52, 0x32, 0xaf, 0x28, 0x6b, 0xca, + 0xc6, 0xf4, 0xe6, 0xd9, 0x52, 0x8a, 0x9b, 0x4a, 0x92, 0x69, 0x7b, 0xe2, 0x49, 0xab, 0x70, 0x42, + 0x43, 0x06, 0x4a, 0x60, 0x5e, 0x4a, 0xe4, 0xdc, 0x8a, 0xb4, 0xfc, 0x64, 0x1c, 0x5e, 0x8c, 0x6d, + 0xa2, 0x92, 0xfb, 0xb0, 0x60, 0xb3, 0xc0, 0x33, 0xab, 0x7e, 0xe5, 0x71, 0x83, 0x07, 0xac, 0x12, + 0x98, 0xd5, 0x47, 0xcc, 0x13, 0x2a, 0xa7, 0xb6, 0x0b, 0xed, 0x56, 0xe1, 0x6c, 0x53, 0xb7, 0xad, + 0xeb, 0x34, 0xed, 0x14, 0xd5, 0x08, 0x6e, 0xdf, 0x0f, 0x77, 0x1f, 0x88, 0x4d, 0x52, 0x83, 0x39, + 0x97, 0x73, 0xab, 0x62, 0xeb, 0xde, 0x23, 0x16, 0x54, 0xaa, 0xba, 0xbb, 0x32, 0x26, 0x0c, 0xa0, + 0xe9, 0x06, 0x70, 0x6e, 0xdd, 0x13, 0x47, 0x6f, 0xea, 0xee, 0x76, 0xae, 0xdd, 0x2a, 0x2c, 0x49, + 0x8d, 0x3d, 0x42, 0xa8, 0x36, 0xeb, 0xc6, 0x8f, 0x92, 0x6f, 0xc2, 0xa9, 0x3d, 0x6e, 0x35, 0x6c, + 0x56, 0xd9, 0xbc, 0xb2, 0xcb, 0x1b, 0x9e, 0xbf, 0x32, 0x2e, 0x40, 0xdf, 0xfc, 0x53, 0xab, 0xb0, + 0x5e, 0x37, 0x83, 0xdd, 0xc6, 0x4e, 0xa9, 0xca, 0x6d, 0x0c, 0x1d, 0xfe, 0x29, 0xfa, 0xc6, 0x23, + 0x35, 0x68, 0xba, 0xcc, 0x2f, 0xdd, 0x62, 0xd5, 0x76, 0xab, 0xb0, 0x28, 0x95, 0x25, 0x25, 0x51, + 0x6d, 0x56, 0x6e, 0xe0, 0x9a, 0x18, 0x30, 0x53, 0x63, 0xcc, 0xef, 0x68, 0x9a, 0x10, 0x9a, 0xb6, + 0x46, 0xd2, 0x74, 0x5a, 0x6a, 0x8a, 0xcb, 0xa1, 0xda, 0x74, 0xb8, 0x8c, 0x56, 0x3f, 0x53, 0xe0, + 0x55, 0x11, 0xa2, 0xbb, 0xe6, 0xe3, 0x86, 0x69, 0x98, 0x41, 0xb3, 0xec, 0xf1, 0x3d, 0xd3, 0x60, + 0xde, 0x03, 0xfe, 0x88, 0x39, 0x1a, 0xd3, 0xad, 0xad, 0xf2, 0x57, 0x30, 0xa0, 0xe4, 0x4d, 0x98, + 0xdd, 0x61, 0x35, 0xee, 0xb1, 0xca, 0x2e, 0x33, 0xeb, 0xbb, 0x81, 0x88, 0xd9, 0xf8, 0xf6, 0x4a, + 0xbb, 0x55, 0x58, 0x90, 0xaa, 0x12, 0x64, 0xaa, 0xcd, 0xc8, 0xf5, 0xdb, 0x62, 0x49, 0xae, 0xc3, + 0x8c, 0x5e, 0x0b, 0x98, 0x17, 0x71, 0x8f, 0x09, 0xee, 0xe5, 0x2e, 0xd0, 0x38, 0x95, 0x6a, 0xd3, + 0x62, 0x29, 0x79, 0xe9, 0x3e, 0x5c, 0x18, 0x06, 0x27, 0xe6, 0xd8, 0x3b, 0x30, 0xae, 0xbb, 0x4d, + 0x4c, 0xa9, 0xd7, 0x47, 0xf2, 0x19, 0x20, 0x14, 0xb7, 0x49, 0xb5, 0x50, 0x08, 0xfd, 0x40, 0x81, + 0x8b, 0x19, 0xaa, 0xbf, 0xc4, 0x6d, 0xd3, 0x79, 0x5e, 0xbc, 0x74, 0x00, 0xc5, 0x21, 0xa1, 0xfe, + 0x1b, 0x1c, 0x95, 0x87, 0x73, 0xf2, 0xb6, 0x33, 0xcf, 0x65, 0x41, 0x43, 0xb7, 0x6e, 0x37, 0x82, + 0x86, 0xc7, 0x3a, 0x45, 0xe7, 0xc7, 0x13, 0xb0, 0xda, 0xe7, 0xc0, 0x80, 0xd2, 0x30, 0x76, 0xfc, + 0xd2, 0xf0, 0x3f, 0x77, 0x65, 0x43, 0x8b, 0x2c, 0xee, 0xd4, 0x2b, 0x2e, 0xf7, 0x4d, 0xf1, 0x25, + 0x5a, 0x39, 0x79, 0x7c, 0x8b, 0x92, 0x92, 0xa8, 0x36, 0x1b, 0x6e, 0x94, 0xa3, 0x35, 0xb1, 0x61, + 0xce, 0xdf, 0xe5, 0x5e, 0x10, 0x53, 0x36, 0x29, 0x94, 0xdd, 0x1a, 0x49, 0x19, 0x96, 0xd7, 0x1e, + 0x51, 0x54, 0x3b, 0x25, 0x76, 0x3a, 0xea, 0xe8, 0xfb, 0x0a, 0xd0, 0xd4, 0x0c, 0x91, 0x25, 0x38, + 0xba, 0x60, 0x57, 0x00, 0xc2, 0x4f, 0x68, 0xc5, 0x60, 0x0e, 0xb7, 0x31, 0x77, 0x17, 0xdb, 0xad, + 0xc2, 0x8b, 0x78, 0xbb, 0x3a, 0x34, 0xaa, 0x4d, 0x85, 0x8b, 0x5b, 0xe1, 0x6f, 0x72, 0x0d, 0xa6, + 0x65, 0xba, 0x48, 0x36, 0x99, 0x53, 0x4b, 0xed, 0x56, 0x81, 0x48, 0xb6, 0x18, 0x91, 0x6a, 0x20, + 0x56, 0x82, 0x91, 0xfe, 0x63, 0x02, 0x5e, 0xca, 0x44, 0x85, 0xd9, 0x5b, 0x86, 0x93, 0xae, 0x67, + 0x56, 0x19, 0x22, 0xba, 0x3e, 0x92, 0x8b, 0x66, 0xf0, 0x0b, 0x14, 0x0a, 0xa0, 0x9a, 0x14, 0xf4, + 0xc9, 0x7d, 0xf8, 0x3f, 0xbf, 0x0f, 0x47, 0x2a, 0xea, 0x97, 0x5d, 0x41, 0x88, 0x2a, 0x6a, 0xa1, + 0xb7, 0xa0, 0x76, 0xe8, 0x32, 0x25, 0x53, 0x2e, 0x14, 0x9e, 0xf8, 0x8f, 0x5e, 0xa8, 0x97, 0x7b, + 0xef, 0x53, 0x0f, 0x28, 0x04, 0xbf, 0x03, 0x2b, 0xe2, 0xd8, 0x96, 0x65, 0x75, 0x5c, 0x12, 0x21, + 0xbe, 0x0d, 0xd0, 0x6d, 0xaf, 0xb1, 0x5b, 0x5d, 0x2f, 0x61, 0xcb, 0x1c, 0x42, 0x2c, 0xc9, 0x6e, + 0x1f, 0xbb, 0xec, 0x52, 0x59, 0xaf, 0x33, 0xe4, 0xd5, 0x62, 0x9c, 0xf4, 0x37, 0x0a, 0x9c, 0x49, + 0x51, 0x82, 0x37, 0xfa, 0x6b, 0x30, 0xd5, 0x0d, 0xb4, 0xb2, 0x36, 0xbe, 0x31, 0xbd, 0xf9, 0xe9, + 0xd4, 0x8e, 0x32, 0x14, 0x61, 0x32, 0x23, 0x92, 0xb0, 0xbd, 0x12, 0xf6, 0xc6, 0xed, 0x56, 0x61, + 0x3e, 0xea, 0x2b, 0x3b, 0x21, 0xee, 0x0a, 0x24, 0x5f, 0x4c, 0xd8, 0x20, 0x1b, 0xd6, 0x57, 0x06, + 0xda, 0x20, 0xa1, 0x25, 0x8c, 0xb8, 0x06, 0x0b, 0xd8, 0x66, 0x4b, 0xd1, 0x91, 0x93, 0x0a, 0x30, + 0x1d, 0x69, 0xab, 0x98, 0x86, 0x8c, 0xab, 0x06, 0xd1, 0xd6, 0x1d, 0x83, 0xfe, 0x6e, 0x1c, 0x16, + 0x7b, 0x38, 0xd1, 0x72, 0x0d, 0x5e, 0x88, 0xce, 0xa1, 0x77, 0x57, 0xfb, 0xb4, 0xd2, 0x68, 0xf1, + 0xf2, 0x93, 0x56, 0x41, 0x69, 0xb7, 0x0a, 0x73, 0x49, 0x8b, 0xa9, 0xd6, 0x91, 0x43, 0x18, 0xcc, + 0xef, 0xe9, 0x56, 0x43, 0x60, 0x0e, 0x67, 0x9c, 0x9a, 0x19, 0xa0, 0xd5, 0x67, 0x12, 0x56, 0x47, + 0xf6, 0xde, 0xe4, 0xa6, 0xb3, 0x5d, 0x40, 0x4f, 0x2e, 0x63, 0xc5, 0xe9, 0x11, 0x40, 0xb5, 0xb9, + 0xce, 0x56, 0x59, 0xec, 0x90, 0xef, 0x2a, 0xb0, 0x6c, 0xeb, 0x5e, 0xdd, 0x74, 0x2a, 0xb6, 0x6e, + 0x3a, 0x01, 0x73, 0x74, 0xa7, 0xca, 0x2a, 0x9e, 0x1e, 0x30, 0xac, 0x75, 0xe5, 0x50, 0xe6, 0x48, + 0x17, 0x36, 0x8f, 0x65, 0x36, 0x5d, 0x2c, 0xd5, 0x16, 0x25, 0xe5, 0x5e, 0x97, 0xa0, 0xe9, 0x01, + 0x0b, 0x2d, 0x66, 0xb5, 0x1a, 0xab, 0x86, 0xbe, 0xaa, 0xc8, 0x23, 0xa2, 0x08, 0x8e, 0x62, 0x71, + 0xaf, 0x00, 0xaa, 0xcd, 0x75, 0xb6, 0xee, 0xc9, 0x9d, 0x0f, 0x15, 0xd8, 0x48, 0xfd, 0x40, 0x45, + 0xd1, 0x79, 0xd7, 0x7c, 0x2f, 0xca, 0x7e, 0xf2, 0x0d, 0x98, 0xed, 0x24, 0x45, 0x68, 0xa2, 0x08, + 0xef, 0xa9, 0xcd, 0xf3, 0x99, 0xe1, 0x7d, 0xd0, 0x74, 0x59, 0xbc, 0x81, 0x4d, 0x48, 0xa0, 0xda, + 0x8c, 0x1b, 0x3b, 0x47, 0x2e, 0xc2, 0xa7, 0x74, 0xc3, 0xf0, 0x98, 0xef, 0x63, 0x4d, 0x20, 0xed, + 0x56, 0xe1, 0x14, 0x76, 0x8b, 0x92, 0x40, 0xb5, 0xe8, 0x08, 0xfd, 0x69, 0x34, 0x81, 0x64, 0x83, + 0xc7, 0xbc, 0xdc, 0x87, 0xe5, 0x80, 0x07, 0xba, 0xd5, 0xa9, 0x9a, 0x15, 0xdf, 0x7c, 0x8f, 0x55, + 0x1a, 0xbe, 0x81, 0x69, 0x9a, 0xe1, 0xd8, 0x75, 0x74, 0x2c, 0x06, 0xb3, 0x47, 0x4e, 0xc3, 0x37, + 0x84, 0x2c, 0xaa, 0x2d, 0x08, 0x4a, 0x5c, 0xfd, 0x43, 0xdf, 0xa0, 0xdf, 0x57, 0xb0, 0x18, 0x6f, + 0x49, 0xe0, 0x47, 0x4a, 0x52, 0xcc, 0x6c, 0x65, 0xa0, 0xd9, 0x3d, 0x05, 0x6c, 0xec, 0xd8, 0x05, + 0xec, 0x23, 0x05, 0xbf, 0x01, 0x47, 0x61, 0xfd, 0x77, 0x15, 0xb1, 0x1c, 0x56, 0xfb, 0x5b, 0x77, + 0xcb, 0x72, 0xa4, 0xd3, 0x83, 0xc8, 0x60, 0xfa, 0x2d, 0x2c, 0xd2, 0x49, 0x1a, 0xda, 0xb7, 0x04, + 0x93, 0x7e, 0xd3, 0xde, 0xe1, 0x16, 0x16, 0x38, 0x5c, 0x91, 0x3b, 0x70, 0x32, 0xbc, 0x9c, 0x61, + 0x12, 0x8e, 0x67, 0x27, 0x46, 0x8f, 0xa1, 0x86, 0xe5, 0x8a, 0x6b, 0xed, 0x53, 0x4d, 0x4a, 0xa0, + 0xbf, 0x8c, 0x3e, 0xa3, 0x5f, 0xf0, 0x03, 0xd3, 0xd6, 0x03, 0x16, 0x01, 0xd9, 0xb2, 0x79, 0xc3, + 0x89, 0x7f, 0x46, 0x6d, 0xd3, 0x09, 0xfa, 0x7d, 0x46, 0xbb, 0x34, 0xaa, 0x4d, 0x85, 0x0b, 0xf9, + 0x19, 0x7d, 0x17, 0x26, 0x75, 0x21, 0x06, 0x6f, 0xcb, 0xe7, 0x86, 0xac, 0x4c, 0x77, 0x9c, 0xa0, + 0xdd, 0x2a, 0xcc, 0x62, 0x82, 0x09, 0x09, 0x54, 0x43, 0x51, 0xf4, 0x57, 0x0a, 0x7e, 0x63, 0xfb, + 0x21, 0x46, 0xe7, 0xbd, 0xdd, 0x51, 0x3e, 0xf0, 0xfa, 0x2c, 0xa2, 0x97, 0xd2, 0x35, 0x92, 0x1b, + 0x30, 0x5e, 0x63, 0x6c, 0x70, 0x41, 0x27, 0x28, 0x06, 0x3a, 0x8d, 0x1d, 0xd5, 0x42, 0x4e, 0xfa, + 0x6b, 0x05, 0xd6, 0x12, 0x90, 0x35, 0x66, 0x30, 0x66, 0x27, 0x5d, 0x7c, 0x1d, 0x66, 0x3c, 0xb1, + 0x9d, 0x70, 0x72, 0x6c, 0x38, 0x8e, 0x53, 0xa9, 0x36, 0x2d, 0x97, 0xd2, 0xd1, 0x5f, 0x07, 0xb0, + 0xdc, 0xa0, 0x92, 0x70, 0xf6, 0x8d, 0x91, 0x9c, 0x8d, 0x81, 0xec, 0x4a, 0xa1, 0xda, 0x94, 0xe5, + 0x06, 0x12, 0x22, 0xfd, 0x85, 0x02, 0xe7, 0x33, 0x0c, 0x78, 0xee, 0x3c, 0xbe, 0xf9, 0xd1, 0x22, + 0x9c, 0x14, 0x80, 0xc9, 0xb7, 0x15, 0x98, 0x94, 0xcf, 0x7a, 0xe4, 0x95, 0xbe, 0xb5, 0x21, 0xf9, + 0x86, 0x98, 0xdb, 0x18, 0x7c, 0x10, 0x1b, 0xb9, 0x97, 0xbe, 0xf3, 0xfb, 0xbf, 0xbe, 0x3f, 0xb6, + 0x4a, 0xce, 0xaa, 0xc8, 0xa1, 0x1e, 0x7d, 0xae, 0x24, 0xfb, 0x30, 0x51, 0xe6, 0xdc, 0x22, 0x2f, + 0x67, 0x88, 0xed, 0xbe, 0x2d, 0xe6, 0xd6, 0x07, 0x1d, 0x43, 0xdd, 0xe7, 0x85, 0xee, 0xb3, 0xe4, + 0x4c, 0xba, 0xee, 0x50, 0xe3, 0x9f, 0x15, 0x58, 0xcd, 0x7c, 0x56, 0x22, 0x6f, 0xf5, 0x57, 0x36, + 0xcc, 0xbb, 0x59, 0xee, 0xc6, 0xb1, 0xf9, 0xd1, 0x8a, 0x37, 0x84, 0x15, 0x97, 0xc9, 0xa5, 0x54, + 0x2b, 0xac, 0x48, 0x46, 0xd1, 0x45, 0x21, 0xbe, 0xea, 0x31, 0xdd, 0x2a, 0xea, 0x6e, 0x93, 0xfc, + 0x4d, 0x81, 0xb5, 0x41, 0xcf, 0x41, 0x64, 0x6b, 0x54, 0x80, 0x47, 0x5e, 0xbd, 0x72, 0xdb, 0xff, + 0x8a, 0x08, 0x34, 0xf3, 0xf3, 0xc2, 0xcc, 0xab, 0xe4, 0xca, 0xd0, 0x66, 0x3a, 0x52, 0x88, 0xb0, + 0xf4, 0x03, 0x05, 0xe6, 0x7b, 0x9b, 0x08, 0x72, 0x29, 0x23, 0x4f, 0xd2, 0xdf, 0xa9, 0x72, 0x9b, + 0xa3, 0xb0, 0x20, 0xf2, 0x92, 0x40, 0xbe, 0x41, 0xd6, 0xd3, 0xd3, 0x2c, 0x62, 0x2b, 0xd6, 0x10, + 0xd6, 0x1f, 0x14, 0x58, 0x4a, 0x7f, 0x4e, 0x20, 0xd7, 0x86, 0x57, 0x9f, 0x98, 0xe2, 0x72, 0xaf, + 0x8f, 0xce, 0x88, 0xe8, 0xef, 0x08, 0xf4, 0x37, 0xc9, 0xd6, 0x70, 0xe8, 0xd5, 0x83, 0xee, 0x44, + 0x78, 0xa8, 0x1e, 0xc4, 0xe6, 0xbc, 0xc3, 0x64, 0x10, 0x70, 0xae, 0x1b, 0x2a, 0x08, 0xc9, 0xd1, + 0x76, 0xa8, 0x20, 0xf4, 0x4e, 0xbb, 0xc3, 0x06, 0x81, 0x23, 0xac, 0x44, 0x10, 0x12, 0x33, 0xe8, + 0x50, 0x41, 0x48, 0x1b, 0xa5, 0x87, 0x0a, 0x42, 0xfa, 0xb8, 0x3b, 0x6c, 0x10, 0x10, 0x7d, 0x56, + 0x10, 0x7e, 0xa0, 0xc0, 0x4c, 0x7c, 0xa0, 0x25, 0xc5, 0xfe, 0xa8, 0x52, 0xa6, 0xeb, 0x5c, 0x69, + 0xd8, 0xe3, 0x08, 0x7d, 0x5d, 0x40, 0x5f, 0x23, 0xf9, 0x3e, 0x45, 0x36, 0x82, 0xf1, 0x23, 0x05, + 0x5e, 0x88, 0xb8, 0xc9, 0xab, 0x59, 0x15, 0x3c, 0x31, 0xc8, 0xe6, 0x2e, 0x0c, 0x73, 0x14, 0xb1, + 0x5c, 0x11, 0x58, 0x4a, 0xe4, 0x62, 0x36, 0x16, 0xf5, 0x20, 0x36, 0x1a, 0x1f, 0x92, 0xbf, 0x2b, + 0x70, 0x2e, 0x6b, 0x00, 0x21, 0x6f, 0x0e, 0x7f, 0xb9, 0x52, 0xa6, 0xae, 0xdc, 0x5b, 0xc7, 0x65, + 0x47, 0xab, 0x34, 0x61, 0xd5, 0x5d, 0xf2, 0xce, 0x00, 0xab, 0x52, 0xee, 0x6a, 0x62, 0x56, 0x3b, + 0x54, 0x0f, 0x70, 0x02, 0x39, 0x24, 0x3f, 0x57, 0x60, 0xbe, 0x77, 0x6a, 0xc8, 0xba, 0xaa, 0x7d, + 0x06, 0x9f, 0xac, 0xab, 0xda, 0x6f, 0x28, 0xa1, 0xaf, 0x09, 0x7b, 0x2e, 0x90, 0x8d, 0x54, 0x7b, + 0x3a, 0x18, 0x63, 0xb9, 0xf3, 0x43, 0x05, 0x66, 0xe3, 0xfd, 0x7f, 0x66, 0x52, 0xa7, 0x0c, 0x11, + 0x59, 0x49, 0x9d, 0x36, 0x57, 0x0c, 0x4c, 0x6a, 0x6e, 0xf9, 0xaa, 0x61, 0xb9, 0xe4, 0xb7, 0x0a, + 0x2c, 0xa5, 0x77, 0xd9, 0x59, 0x55, 0x24, 0x73, 0x92, 0xc8, 0xaa, 0x22, 0xd9, 0x0d, 0x3d, 0xbd, + 0x2a, 0x50, 0xbf, 0x46, 0x4a, 0xa9, 0xa8, 0x19, 0x32, 0x17, 0x0d, 0xcb, 0x2d, 0x06, 0x21, 0x7b, + 0x11, 0x9b, 0xc9, 0x0f, 0x15, 0x58, 0x48, 0xeb, 0x5b, 0xc9, 0x67, 0x07, 0x43, 0x49, 0x69, 0xd4, + 0x73, 0x57, 0x47, 0x65, 0x43, 0xfc, 0x97, 0x05, 0xfe, 0x22, 0xf9, 0x4c, 0x36, 0x7e, 0xd9, 0xd7, + 0x23, 0xf8, 0xed, 0xdb, 0x4f, 0x9e, 0xe6, 0x95, 0x8f, 0x9f, 0xe6, 0x95, 0xbf, 0x3c, 0xcd, 0x2b, + 0xdf, 0x7b, 0x96, 0x3f, 0xf1, 0xf1, 0xb3, 0xfc, 0x89, 0x3f, 0x3e, 0xcb, 0x9f, 0xf8, 0xea, 0xc5, + 0x58, 0x6f, 0xff, 0xd0, 0x79, 0xe8, 0x98, 0xb7, 0x4d, 0xb5, 0xba, 0xab, 0x9b, 0x8e, 0xba, 0x9f, + 0x10, 0x2c, 0xba, 0xfc, 0x9d, 0x49, 0xf1, 0x3f, 0xf3, 0xcb, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, + 0x82, 0x03, 0xfd, 0x7c, 0x37, 0x20, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3240,30 +3269,26 @@ func (m *QueryEstimateDLPTokenAmountResponse) MarshalToSizedBuffer(dAtA []byte) _ = i var l int _ = l - if m.Fee != nil { - { - size := m.Fee.Size() - i -= size - if _, err := m.Fee.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + { + size, err := m.Fee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x12 + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } - if m.Amount != nil { - { - size := m.Amount.Size() - i -= size - if _, err := m.Amount.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -3329,30 +3354,26 @@ func (m *QueryEstimateRedeemAmountResponse) MarshalToSizedBuffer(dAtA []byte) (i _ = i var l int _ = l - if m.Fee != nil { - { - size := m.Fee.Size() - i -= size - if _, err := m.Fee.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + { + size, err := m.Fee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x12 + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } - if m.Amount != nil { - { - size := m.Amount.Size() - i -= size - if _, err := m.Amount.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 + { + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -3787,14 +3808,10 @@ func (m *QueryEstimateDLPTokenAmountResponse) Size() (n int) { } var l int _ = l - if m.Amount != nil { - l = m.Amount.Size() - n += 1 + l + sovQuery(uint64(l)) - } - if m.Fee != nil { - l = m.Fee.Size() - n += 1 + l + sovQuery(uint64(l)) - } + l = m.Amount.Size() + n += 1 + l + sovQuery(uint64(l)) + l = m.Fee.Size() + n += 1 + l + sovQuery(uint64(l)) return n } @@ -3821,14 +3838,10 @@ func (m *QueryEstimateRedeemAmountResponse) Size() (n int) { } var l int _ = l - if m.Amount != nil { - l = m.Amount.Size() - n += 1 + l + sovQuery(uint64(l)) - } - if m.Fee != nil { - l = m.Fee.Size() - n += 1 + l + sovQuery(uint64(l)) - } + l = m.Amount.Size() + n += 1 + l + sovQuery(uint64(l)) + l = m.Fee.Size() + n += 1 + l + sovQuery(uint64(l)) return n } @@ -6688,7 +6701,7 @@ func (m *QueryEstimateDLPTokenAmountResponse) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6698,24 +6711,21 @@ func (m *QueryEstimateDLPTokenAmountResponse) 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 ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Int - m.Amount = &v if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -6724,7 +6734,7 @@ func (m *QueryEstimateDLPTokenAmountResponse) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6734,24 +6744,21 @@ func (m *QueryEstimateDLPTokenAmountResponse) 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 ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Int - m.Fee = &v if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -6928,7 +6935,7 @@ func (m *QueryEstimateRedeemAmountResponse) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6938,24 +6945,21 @@ func (m *QueryEstimateRedeemAmountResponse) 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 ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Int - m.Amount = &v if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -6964,7 +6968,7 @@ func (m *QueryEstimateRedeemAmountResponse) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6974,24 +6978,21 @@ func (m *QueryEstimateRedeemAmountResponse) 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 ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Int - m.Fee = &v if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } From 9727a652946d4fbd79ecee524599ff936b646c7a Mon Sep 17 00:00:00 2001 From: mkXultra Date: Thu, 9 Mar 2023 17:07:38 +0900 Subject: [PATCH 2/2] modify: upate swagger --- docs/client/swagger.yaml | 108 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 8 deletions(-) diff --git a/docs/client/swagger.yaml b/docs/client/swagger.yaml index f40822002..84220254e 100644 --- a/docs/client/swagger.yaml +++ b/docs/client/swagger.yaml @@ -4854,9 +4854,35 @@ paths: type: object properties: amount: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. fee: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. default: description: An unexpected error response. schema: @@ -5067,9 +5093,35 @@ paths: type: object properties: amount: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. fee: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. default: description: An unexpected error response. schema: @@ -13353,16 +13405,56 @@ definitions: type: object properties: amount: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. fee: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. ununifi.derivatives.QueryEstimateRedeemAmountResponse: type: object properties: amount: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. fee: - type: string + type: object + properties: + denom: + type: string + amount: + type: string + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. ununifi.derivatives.QueryLiquidityProviderTokenNominalAPYResponse: type: object properties: