From 82441cec056d74ed6e81cbcfcaf6cc6ae5478a2a Mon Sep 17 00:00:00 2001 From: Xiaoyu Chen Date: Mon, 6 Jun 2022 15:58:43 -0700 Subject: [PATCH] Fix issues with querying --- proto/dex/query.proto | 20 +- scripts/populate_mock_data.sh | 24 +- x/dex/client/cli/query_long_book.go | 7 +- x/dex/client/cli/query_short_book.go | 7 +- x/dex/keeper/grpc_query_long_book.go | 6 +- x/dex/keeper/grpc_query_long_book_test.go | 6 +- x/dex/keeper/grpc_query_short_book.go | 6 +- x/dex/keeper/grpc_query_short_book_test.go | 6 +- x/dex/types/enums.go | 2 +- x/dex/types/query.pb.go | 205 ++++++++--------- x/dex/types/query.pb.gw.go | 248 ++++++++++++++++++--- 11 files changed, 360 insertions(+), 177 deletions(-) diff --git a/proto/dex/query.proto b/proto/dex/query.proto index bea82741ec..fae51f9448 100644 --- a/proto/dex/query.proto +++ b/proto/dex/query.proto @@ -22,22 +22,22 @@ service Query { } // Queries a LongBook by id. rpc LongBook(QueryGetLongBookRequest) returns (QueryGetLongBookResponse) { - option (google.api.http).get = "/sei-protocol/seichain/dex/long_book/{contractAddr}/{priceDenom}/{assetDenom}"; + option (google.api.http).get = "/sei-protocol/seichain/dex/long_book/{contractAddr}/{priceDenom}/{assetDenom}/{price}"; } // Queries a list of LongBook items. rpc LongBookAll(QueryAllLongBookRequest) returns (QueryAllLongBookResponse) { - option (google.api.http).get = "/sei-protocol/seichain/dex/long_book"; + option (google.api.http).get = "/sei-protocol/seichain/dex/long_book/{contractAddr}/{priceDenom}/{assetDenom}"; } // Queries a ShortBook by id. rpc ShortBook(QueryGetShortBookRequest) returns (QueryGetShortBookResponse) { - option (google.api.http).get = "/sei-protocol/seichain/dex/short_book/{contractAddr}/{priceDenom}/{assetDenom}"; + option (google.api.http).get = "/sei-protocol/seichain/dex/short_book/{contractAddr}/{priceDenom}/{assetDenom}/{price}"; } // Queries a list of ShortBook items. rpc ShortBookAll(QueryAllShortBookRequest) returns (QueryAllShortBookResponse) { - option (google.api.http).get = "/sei-protocol/seichain/dex/short_book"; + option (google.api.http).get = "/sei-protocol/seichain/dex/short_book/{contractAddr}/{priceDenom}/{assetDenom}"; } rpc SettlementsAll(QueryAllSettlementsRequest) returns (QueryAllSettlementsResponse) { @@ -62,11 +62,7 @@ message QueryParamsResponse { } message QueryGetLongBookRequest { - string price = 1 [ - (gogoproto.moretags) = "yaml:\"price\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false - ]; + string price = 1; string contractAddr = 2; Denom priceDenom = 3; Denom assetDenom = 4; @@ -89,11 +85,7 @@ message QueryAllLongBookResponse { } message QueryGetShortBookRequest { - string price = 1 [ - (gogoproto.moretags) = "yaml:\"price\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false - ]; + string price = 1; string contractAddr = 2; Denom priceDenom = 3; Denom assetDenom = 4; diff --git a/scripts/populate_mock_data.sh b/scripts/populate_mock_data.sh index ac16305225..2f440b5817 100644 --- a/scripts/populate_mock_data.sh +++ b/scripts/populate_mock_data.sh @@ -9,23 +9,23 @@ echo echo -n Key Name: read keyname echo -echo -n Price denominator {e.g. ust}: +echo -n Price denominator {e.g. sei}: read pdenom echo -echo -n Asset denominator {e.g. luna}: +echo -n Asset denominator {e.g. atom}: read adenom echo -$sei tx wasm store $contract -y --from=$keyname --chain-id=sei-chain --gas=3000000 --fees=1000ust --broadcast-mode=block +$sei tx wasm store $contract -y --from=$keyname --chain-id=sei-chain --gas=3000000 --fees=100000usei --broadcast-mode=block -addr=$($sei tx wasm instantiate 1 '{}' -y --no-admin --from=$keyname --chain-id=sei-chain --gas=1500000 --fees=1000ust --broadcast-mode=block --label=dex | grep -A 1 "key: _contract_address" | sed -n 's/.*value: //p' | xargs) +addr=$($sei tx wasm instantiate 1 '{}' -y --no-admin --from=$keyname --chain-id=sei-chain --gas=1500000 --fees=100000usei --broadcast-mode=block --label=dex | grep -A 1 "key: _contract_address" | sed -n 's/.*value: //p' | xargs) -$sei tx dex register-contract $addr 1 -y --from=$keyname --chain-id=sei-chain --fees=10000000ust --gas=500000 --broadcast-mode=block -$sei tx dex register-pair $addr $pdenom $adenom -y --from=$keyname --chain-id=sei-chain --fees=10000000ust --gas=500000 --broadcast-mode=block +$sei tx dex register-contract $addr 1 -y --from=$keyname --chain-id=sei-chain --fees=10000000usei --gas=500000 --broadcast-mode=block +$sei tx dex register-pair $addr $pdenom $adenom -y --from=$keyname --chain-id=sei-chain --fees=10000000usei --gas=500000 --broadcast-mode=block -$sei tx dex place-orders $addr 0 Long,101,5,$pdenom,$adenom,Open,Limit,1 --amount=100000ust -y --from=ta0 --chain-id=sei-chain --fees=1000000ust --gas=50000000 --broadcast-mode=block -$sei tx dex place-orders $addr 0 Short,99,5,$pdenom,$adenom,Open,Limit,2 --amount=100000ust -y --from=ta1 --chain-id=sei-chain --fees=1000000ust --gas=50000000 --broadcast-mode=block -$sei tx dex place-orders $addr 0 Long,99,5,$pdenom,$adenom,Open,Limit,1 --amount=100000ust -y --from=ta0 --chain-id=sei-chain --fees=1000000ust --gas=50000000 --broadcast-mode=block -$sei tx dex place-orders $addr 0 Short,101,5,$pdenom,$adenom,Open,Limit,2 --amount=100000ust -y --from=ta1 --chain-id=sei-chain --fees=1000000ust --gas=50000000 --broadcast-mode=block -$sei tx dex place-orders $addr 0 Long,98,3,$pdenom,$adenom,Open,Limit,1 --amount=100000ust -y --from=ta1 --chain-id=sei-chain --fees=1000000ust --gas=50000000 --broadcast-mode=block -$sei tx dex place-orders $addr 0 Short,102,3,$pdenom,$adenom,Open,Limit,2 --amount=100000ust -y --from=ta0 --chain-id=sei-chain --fees=1000000ust --gas=50000000 --broadcast-mode=block +$sei tx dex place-orders $addr Long,1.01,5,$pdenom,$adenom,Open,Limit,1 --amount=10000000usei -y --from=ta0 --chain-id=sei-chain --fees=1000000usei --gas=50000000 --broadcast-mode=block +$sei tx dex place-orders $addr Short,0.99,5,$pdenom,$adenom,Open,Limit,2 --amount=10000000usei -y --from=ta1 --chain-id=sei-chain --fees=1000000usei --gas=50000000 --broadcast-mode=block +$sei tx dex place-orders $addr Long,0.99,5,$pdenom,$adenom,Open,Limit,1 --amount=10000000usei -y --from=ta0 --chain-id=sei-chain --fees=1000000usei --gas=50000000 --broadcast-mode=block +$sei tx dex place-orders $addr Short,1.01,5,$pdenom,$adenom,Open,Limit,2 --amount=10000000usei -y --from=ta1 --chain-id=sei-chain --fees=1000000usei --gas=50000000 --broadcast-mode=block +$sei tx dex place-orders $addr Long,0.98,3,$pdenom,$adenom,Open,Limit,1 --amount=10000000usei -y --from=ta1 --chain-id=sei-chain --fees=1000000usei --gas=50000000 --broadcast-mode=block +$sei tx dex place-orders $addr Short,1.02,3,$pdenom,$adenom,Open,Limit,2 --amount=10000000usei -y --from=ta0 --chain-id=sei-chain --fees=1000000usei --gas=50000000 --broadcast-mode=block diff --git a/x/dex/client/cli/query_long_book.go b/x/dex/client/cli/query_long_book.go index 9312323525..1c4c109eda 100644 --- a/x/dex/client/cli/query_long_book.go +++ b/x/dex/client/cli/query_long_book.go @@ -6,7 +6,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sei-protocol/sei-chain/x/dex/types" "github.com/spf13/cobra" ) @@ -73,10 +72,6 @@ func CmdShowLongBook() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) contractAddr := args[0] - price, err := sdk.NewDecFromStr(args[1]) - if err != nil { - return err - } reqPriceDenom, unit, err := types.GetDenomFromStr(args[2]) if err != nil { return err @@ -93,7 +88,7 @@ func CmdShowLongBook() *cobra.Command { } params := &types.QueryGetLongBookRequest{ - Price: price, + Price: args[1], ContractAddr: contractAddr, PriceDenom: reqPriceDenom, AssetDenom: reqAssetDenom, diff --git a/x/dex/client/cli/query_short_book.go b/x/dex/client/cli/query_short_book.go index ef1175b289..ce81be7629 100644 --- a/x/dex/client/cli/query_short_book.go +++ b/x/dex/client/cli/query_short_book.go @@ -6,7 +6,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sei-protocol/sei-chain/x/dex/types" "github.com/spf13/cobra" ) @@ -74,10 +73,6 @@ func CmdShowShortBook() *cobra.Command { queryClient := types.NewQueryClient(clientCtx) contractAddr := args[0] - price, err := sdk.NewDecFromStr(args[1]) - if err != nil { - return err - } reqPriceDenom, unit, err := types.GetDenomFromStr(args[2]) if err != nil { return err @@ -94,7 +89,7 @@ func CmdShowShortBook() *cobra.Command { } params := &types.QueryGetShortBookRequest{ - Price: price, + Price: args[1], ContractAddr: contractAddr, PriceDenom: reqPriceDenom, AssetDenom: reqAssetDenom, diff --git a/x/dex/keeper/grpc_query_long_book.go b/x/dex/keeper/grpc_query_long_book.go index 7e865b90aa..cd538149d8 100644 --- a/x/dex/keeper/grpc_query_long_book.go +++ b/x/dex/keeper/grpc_query_long_book.go @@ -32,7 +32,11 @@ func (k Keeper) LongBook(c context.Context, req *types.QueryGetLongBookRequest) } ctx := sdk.UnwrapSDKContext(c) - longBook, found := k.GetLongBookByPrice(ctx, req.ContractAddr, req.Price, req.PriceDenom, req.AssetDenom) + price, err := sdk.NewDecFromStr(req.Price) + if err != nil { + return nil, err + } + longBook, found := k.GetLongBookByPrice(ctx, req.ContractAddr, price, req.PriceDenom, req.AssetDenom) if !found { return nil, sdkerrors.ErrKeyNotFound } diff --git a/x/dex/keeper/grpc_query_long_book_test.go b/x/dex/keeper/grpc_query_long_book_test.go index 39f5848a6c..88ed43f00c 100644 --- a/x/dex/keeper/grpc_query_long_book_test.go +++ b/x/dex/keeper/grpc_query_long_book_test.go @@ -27,17 +27,17 @@ func TestLongBookQuerySingle(t *testing.T) { }{ { desc: "First", - request: &types.QueryGetLongBookRequest{Price: msgs[0].Price, ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, + request: &types.QueryGetLongBookRequest{Price: msgs[0].Price.String(), ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, response: &types.QueryGetLongBookResponse{LongBook: msgs[0]}, }, { desc: "Second", - request: &types.QueryGetLongBookRequest{Price: msgs[1].Price, ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, + request: &types.QueryGetLongBookRequest{Price: msgs[1].Price.String(), ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, response: &types.QueryGetLongBookResponse{LongBook: msgs[1]}, }, { desc: "KeyNotFound", - request: &types.QueryGetLongBookRequest{Price: sdk.NewDec(100000), ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, + request: &types.QueryGetLongBookRequest{Price: "100000", ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, err: sdkerrors.ErrKeyNotFound, }, { diff --git a/x/dex/keeper/grpc_query_short_book.go b/x/dex/keeper/grpc_query_short_book.go index 163f94cfaf..66c357f578 100644 --- a/x/dex/keeper/grpc_query_short_book.go +++ b/x/dex/keeper/grpc_query_short_book.go @@ -31,7 +31,11 @@ func (k Keeper) ShortBook(c context.Context, req *types.QueryGetShortBookRequest } ctx := sdk.UnwrapSDKContext(c) - shortBook, found := k.GetShortBookByPrice(ctx, req.ContractAddr, req.Price, req.PriceDenom, req.AssetDenom) + price, err := sdk.NewDecFromStr(req.Price) + if err != nil { + return nil, err + } + shortBook, found := k.GetShortBookByPrice(ctx, req.ContractAddr, price, req.PriceDenom, req.AssetDenom) if !found { return nil, sdkerrors.ErrKeyNotFound } diff --git a/x/dex/keeper/grpc_query_short_book_test.go b/x/dex/keeper/grpc_query_short_book_test.go index 36daff5404..e3e8a560ba 100644 --- a/x/dex/keeper/grpc_query_short_book_test.go +++ b/x/dex/keeper/grpc_query_short_book_test.go @@ -27,17 +27,17 @@ func TestShortBookQuerySingle(t *testing.T) { }{ { desc: "First", - request: &types.QueryGetShortBookRequest{Price: msgs[0].Price, ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, + request: &types.QueryGetShortBookRequest{Price: msgs[0].Price.String(), ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, response: &types.QueryGetShortBookResponse{ShortBook: msgs[0]}, }, { desc: "Second", - request: &types.QueryGetShortBookRequest{Price: msgs[1].Price, ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, + request: &types.QueryGetShortBookRequest{Price: msgs[1].Price.String(), ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, response: &types.QueryGetShortBookResponse{ShortBook: msgs[1]}, }, { desc: "KeyNotFound", - request: &types.QueryGetShortBookRequest{Price: sdk.NewDec(10000), ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, + request: &types.QueryGetShortBookRequest{Price: "10000", ContractAddr: TEST_CONTRACT, PriceDenom: TEST_PRICE_DENOM, AssetDenom: TEST_ASSET_DENOM}, err: sdkerrors.ErrKeyNotFound, }, { diff --git a/x/dex/types/enums.go b/x/dex/types/enums.go index f7d52ed210..0bb021af2d 100644 --- a/x/dex/types/enums.go +++ b/x/dex/types/enums.go @@ -12,7 +12,7 @@ func GetDenomFromStr(str string) (Denom, Unit, error) { val, err := getEnumFromStr(str, Denom_value) if err != nil { if str[0] == MICRO_PREFIX { - microVal, microErr := getEnumFromStr(str, Denom_value) + microVal, microErr := getEnumFromStr(str[1:], Denom_value) if microErr == nil { return Denom(microVal), Unit_MICRO, nil } diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index 0ecd60756b..bd6fc10e5c 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -6,7 +6,6 @@ package types import ( context "context" fmt "fmt" - github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" @@ -115,10 +114,10 @@ func (m *QueryParamsResponse) GetParams() Params { } type QueryGetLongBookRequest struct { - Price github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=price,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"price" yaml:"price"` - ContractAddr string `protobuf:"bytes,2,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"` - PriceDenom Denom `protobuf:"varint,3,opt,name=priceDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"priceDenom,omitempty"` - AssetDenom Denom `protobuf:"varint,4,opt,name=assetDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"assetDenom,omitempty"` + Price string `protobuf:"bytes,1,opt,name=price,proto3" json:"price,omitempty"` + ContractAddr string `protobuf:"bytes,2,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"` + PriceDenom Denom `protobuf:"varint,3,opt,name=priceDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"priceDenom,omitempty"` + AssetDenom Denom `protobuf:"varint,4,opt,name=assetDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"assetDenom,omitempty"` } func (m *QueryGetLongBookRequest) Reset() { *m = QueryGetLongBookRequest{} } @@ -154,6 +153,13 @@ func (m *QueryGetLongBookRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetLongBookRequest proto.InternalMessageInfo +func (m *QueryGetLongBookRequest) GetPrice() string { + if m != nil { + return m.Price + } + return "" +} + func (m *QueryGetLongBookRequest) GetContractAddr() string { if m != nil { return m.ContractAddr @@ -340,10 +346,10 @@ func (m *QueryAllLongBookResponse) GetPagination() *query.PageResponse { } type QueryGetShortBookRequest struct { - Price github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=price,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"price" yaml:"price"` - ContractAddr string `protobuf:"bytes,2,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"` - PriceDenom Denom `protobuf:"varint,3,opt,name=priceDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"priceDenom,omitempty"` - AssetDenom Denom `protobuf:"varint,4,opt,name=assetDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"assetDenom,omitempty"` + Price string `protobuf:"bytes,1,opt,name=price,proto3" json:"price,omitempty"` + ContractAddr string `protobuf:"bytes,2,opt,name=contractAddr,proto3" json:"contractAddr,omitempty"` + PriceDenom Denom `protobuf:"varint,3,opt,name=priceDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"priceDenom,omitempty"` + AssetDenom Denom `protobuf:"varint,4,opt,name=assetDenom,proto3,enum=seiprotocol.seichain.dex.Denom" json:"assetDenom,omitempty"` } func (m *QueryGetShortBookRequest) Reset() { *m = QueryGetShortBookRequest{} } @@ -379,6 +385,13 @@ func (m *QueryGetShortBookRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryGetShortBookRequest proto.InternalMessageInfo +func (m *QueryGetShortBookRequest) GetPrice() string { + if m != nil { + return m.Price + } + return "" +} + func (m *QueryGetShortBookRequest) GetContractAddr() string { if m != nil { return m.ContractAddr @@ -898,69 +911,67 @@ func init() { func init() { proto.RegisterFile("dex/query.proto", fileDescriptor_d8e98105e6e08a59) } var fileDescriptor_d8e98105e6e08a59 = []byte{ - // 986 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xd8, 0x49, 0x20, 0xe3, 0x28, 0xa0, 0xa9, 0x25, 0xcc, 0x82, 0x6c, 0x33, 0xa5, 0x69, - 0x41, 0xf5, 0xae, 0xe2, 0x96, 0x0b, 0x12, 0xad, 0x62, 0x05, 0xcc, 0xa1, 0x85, 0x60, 0x5a, 0x0e, - 0x5c, 0xca, 0x7a, 0x3d, 0x5a, 0xaf, 0xbc, 0xde, 0xd9, 0x7a, 0xc7, 0x34, 0x51, 0x94, 0x0b, 0x17, - 0x38, 0x56, 0x42, 0xf0, 0x01, 0x38, 0x20, 0x21, 0x81, 0x38, 0x71, 0xe2, 0x0b, 0xe4, 0xc0, 0xa1, - 0x12, 0x17, 0xc4, 0x21, 0x42, 0x71, 0x3f, 0x01, 0x9f, 0x00, 0xcd, 0xec, 0xec, 0x1f, 0x7b, 0xbd, - 0xf6, 0x3a, 0xc9, 0x01, 0x44, 0x4f, 0x75, 0xdf, 0xbe, 0xdf, 0xfb, 0xf3, 0x7b, 0xbf, 0x99, 0x79, - 0x81, 0x2f, 0x74, 0xc9, 0xbe, 0xf6, 0x70, 0x44, 0x86, 0x07, 0xaa, 0x3b, 0xa4, 0x8c, 0xa2, 0xb2, - 0x47, 0x2c, 0xf1, 0xcb, 0xa0, 0xb6, 0xea, 0x11, 0xcb, 0xe8, 0xe9, 0x96, 0xa3, 0x76, 0xc9, 0xbe, - 0x52, 0x32, 0xa9, 0x49, 0xc5, 0x27, 0x8d, 0xff, 0xf2, 0xfd, 0x95, 0x57, 0x4d, 0x4a, 0x4d, 0x9b, - 0x68, 0xba, 0x6b, 0x69, 0xba, 0xe3, 0x50, 0xa6, 0x33, 0x8b, 0x3a, 0x9e, 0xfc, 0xfa, 0xa6, 0x41, - 0xbd, 0x01, 0xf5, 0xb4, 0x8e, 0xee, 0x11, 0x3f, 0x8d, 0xf6, 0xf9, 0x76, 0x87, 0x30, 0x7d, 0x5b, - 0x73, 0x75, 0xd3, 0x72, 0x84, 0xb3, 0xf4, 0x7d, 0x91, 0x97, 0xe2, 0xea, 0x43, 0x7d, 0x10, 0xa0, - 0x2f, 0x71, 0x8b, 0x4d, 0x1d, 0xf3, 0x41, 0x87, 0xd2, 0xbe, 0x34, 0x96, 0xb8, 0xd1, 0xeb, 0xd1, - 0x21, 0x4b, 0x5a, 0x09, 0x63, 0x36, 0x19, 0x10, 0x87, 0x49, 0xeb, 0x26, 0xb7, 0xb2, 0x47, 0xba, - 0x2b, 0xff, 0x2f, 0xba, 0x25, 0xce, 0x28, 0xc8, 0x80, 0x4b, 0x10, 0x7d, 0xc4, 0xab, 0xda, 0x13, - 0x69, 0xdb, 0xe4, 0xe1, 0x88, 0x78, 0x0c, 0xdf, 0x87, 0x97, 0x26, 0xac, 0x9e, 0x4b, 0x1d, 0x8f, - 0xa0, 0x5b, 0x70, 0xcd, 0x2f, 0xaf, 0x0c, 0x6a, 0xe0, 0x5a, 0xb1, 0x51, 0x53, 0xd3, 0xb8, 0x52, - 0x7d, 0x64, 0x73, 0xe5, 0xf8, 0xa4, 0x9a, 0x6b, 0x4b, 0x14, 0xfe, 0x26, 0x0f, 0x5f, 0x12, 0x71, - 0x5b, 0x84, 0xdd, 0xa1, 0x8e, 0xd9, 0xa4, 0xb4, 0x2f, 0x53, 0xa2, 0x7b, 0x70, 0xd5, 0x1d, 0x5a, - 0x06, 0x11, 0xa1, 0xd7, 0x9b, 0xb7, 0x38, 0xf0, 0xcf, 0x93, 0xea, 0x96, 0x69, 0xb1, 0xde, 0xa8, - 0xa3, 0x1a, 0x74, 0xa0, 0x49, 0x2a, 0xfd, 0x7f, 0xea, 0x5e, 0xb7, 0xaf, 0xb1, 0x03, 0x97, 0x78, - 0xea, 0x2e, 0x31, 0xfe, 0x3e, 0xa9, 0x6e, 0x1c, 0xe8, 0x03, 0xfb, 0x6d, 0x2c, 0x82, 0xe0, 0xb6, - 0x1f, 0x0c, 0x61, 0xb8, 0x61, 0x50, 0x87, 0x0d, 0x75, 0x83, 0xed, 0x74, 0xbb, 0xc3, 0x72, 0x9e, - 0x07, 0x6f, 0x4f, 0xd8, 0xd0, 0x6d, 0x08, 0x85, 0xf3, 0x2e, 0x71, 0xe8, 0xa0, 0x5c, 0xa8, 0x81, - 0x6b, 0x9b, 0x8d, 0x6a, 0x7a, 0x67, 0xc2, 0xad, 0x1d, 0x83, 0xf0, 0x00, 0xba, 0xe7, 0x11, 0xe6, - 0x07, 0x58, 0xc9, 0x18, 0x20, 0x82, 0xe0, 0xcf, 0x60, 0x39, 0x49, 0x8b, 0xe4, 0x7c, 0x17, 0x3e, - 0x1f, 0xd8, 0x24, 0xeb, 0x38, 0x3d, 0x74, 0xe0, 0x29, 0x79, 0x0f, 0x91, 0xf8, 0xcb, 0x80, 0xf9, - 0x1d, 0xdb, 0x9e, 0x66, 0xfe, 0x3d, 0x08, 0x23, 0x29, 0xca, 0x1c, 0x5b, 0xaa, 0xcf, 0xb2, 0xca, - 0x75, 0xab, 0xfa, 0xc7, 0x43, 0xea, 0x56, 0xdd, 0xd3, 0x4d, 0x22, 0xb1, 0xed, 0x18, 0xf2, 0x3f, - 0xc2, 0xf5, 0x0f, 0x40, 0x92, 0x3d, 0xc1, 0xc4, 0x4c, 0xb2, 0x0b, 0x67, 0x23, 0x1b, 0xb5, 0x26, - 0x08, 0xcd, 0x0b, 0x42, 0xaf, 0x2e, 0x24, 0xd4, 0x2f, 0x21, 0xce, 0x28, 0xfe, 0x36, 0x1f, 0x09, - 0xe3, 0x63, 0x7e, 0xe0, 0x9f, 0x1d, 0x18, 0x7f, 0x88, 0x5d, 0xf8, 0xf2, 0x0c, 0x5e, 0xe4, 0x10, - 0x5b, 0x70, 0x3d, 0x34, 0x4a, 0x39, 0x5f, 0x4e, 0x0f, 0x1e, 0xba, 0xca, 0x31, 0x46, 0x58, 0xfc, - 0x55, 0x3e, 0x92, 0x4a, 0x82, 0xfe, 0xff, 0xd7, 0xa9, 0xf9, 0x09, 0x48, 0xc6, 0x27, 0xa9, 0x98, - 0xcd, 0x78, 0xe1, 0xac, 0x8c, 0x5f, 0xdc, 0xc9, 0x79, 0x0a, 0xa0, 0x12, 0x2a, 0x24, 0x7c, 0x14, - 0x83, 0xf7, 0x2d, 0x41, 0x3a, 0x98, 0x41, 0x7a, 0x0d, 0x16, 0x3b, 0x36, 0x35, 0xfa, 0xef, 0x13, - 0xcb, 0xec, 0x31, 0x51, 0xcc, 0x4a, 0x3b, 0x6e, 0xfa, 0x17, 0x8c, 0xc5, 0x86, 0xaf, 0xcc, 0xec, - 0x52, 0xce, 0xe5, 0x2e, 0x2c, 0xc6, 0xcc, 0x52, 0xa4, 0x57, 0xe6, 0x4c, 0x26, 0x72, 0x96, 0xb3, - 0x89, 0xe3, 0x71, 0x57, 0x72, 0xca, 0x35, 0x90, 0xe4, 0xf4, 0x82, 0x0e, 0x04, 0xfe, 0x05, 0xc8, - 0xa6, 0xa6, 0xd3, 0xa4, 0x35, 0x55, 0x38, 0x4f, 0x53, 0x17, 0x27, 0xb9, 0x5f, 0x81, 0x5c, 0x9a, - 0x5a, 0x84, 0xdd, 0x7b, 0xa4, 0xbb, 0x01, 0x2f, 0x93, 0x2a, 0x01, 0xe7, 0x55, 0x49, 0x7e, 0x69, - 0x95, 0x24, 0xd4, 0x5e, 0x48, 0xaa, 0x1d, 0xdf, 0x81, 0xa5, 0xc9, 0xe2, 0x25, 0xdb, 0x37, 0xe1, - 0x2a, 0x5f, 0x1f, 0x03, 0xf1, 0x54, 0xd2, 0xf3, 0x0a, 0x98, 0xef, 0xdc, 0x18, 0xaf, 0xc3, 0x55, - 0x11, 0x0e, 0x3d, 0x06, 0x70, 0xcd, 0xdf, 0x05, 0xd1, 0xf5, 0x74, 0x6c, 0x72, 0x05, 0x55, 0xea, - 0x19, 0xbd, 0xfd, 0x3a, 0xf1, 0x1b, 0x5f, 0xfc, 0xfe, 0xf4, 0xeb, 0xfc, 0x65, 0xf4, 0x9a, 0xe6, - 0x11, 0xab, 0x1e, 0xe0, 0xb4, 0x00, 0xa7, 0x45, 0xab, 0x35, 0x3a, 0x06, 0xd1, 0x2b, 0x8f, 0xb6, - 0x17, 0xa4, 0x49, 0x6e, 0xaa, 0x4a, 0x63, 0x19, 0x88, 0x2c, 0xef, 0xbe, 0x28, 0xef, 0x43, 0x74, - 0x77, 0x4e, 0x79, 0xe1, 0x9e, 0xaf, 0x1d, 0xc6, 0x47, 0x73, 0xa4, 0x1d, 0x46, 0x62, 0x38, 0xd2, - 0x0e, 0xa3, 0xc1, 0x1e, 0xa1, 0xef, 0x00, 0x2c, 0x06, 0xb9, 0x76, 0x6c, 0x7b, 0x61, 0x37, 0xc9, - 0xed, 0x6f, 0x61, 0x37, 0x33, 0xd6, 0x24, 0x7c, 0x5d, 0x74, 0xb3, 0x85, 0x5e, 0xcf, 0xd2, 0x0d, - 0xfa, 0x0d, 0xc4, 0x9e, 0x07, 0x94, 0x81, 0xbd, 0xe9, 0xb7, 0x56, 0xb9, 0xb1, 0x14, 0x46, 0x16, - 0xf9, 0x89, 0x28, 0x72, 0x0f, 0x7d, 0x30, 0xa7, 0xc8, 0xe8, 0xaf, 0xa8, 0xec, 0x9c, 0x7f, 0x0f, - 0xe0, 0x46, 0x98, 0x8d, 0x93, 0x9e, 0x81, 0xc1, 0xa5, 0x3b, 0x9a, 0xf5, 0xcc, 0xe2, 0xba, 0xe8, - 0xe8, 0x2a, 0xba, 0x92, 0xa9, 0x23, 0xf4, 0x23, 0x80, 0x9b, 0xb1, 0x9b, 0x8e, 0x97, 0x7a, 0x33, - 0x43, 0xda, 0xc4, 0xcd, 0xae, 0xbc, 0xb5, 0x24, 0x6a, 0x99, 0x72, 0x43, 0x1c, 0xfa, 0x19, 0xc0, - 0xe7, 0xe4, 0xed, 0x83, 0xea, 0x8b, 0x07, 0x1e, 0xbb, 0x62, 0x15, 0x35, 0xab, 0xbb, 0xac, 0xec, - 0x5d, 0x51, 0xd9, 0x6d, 0xf4, 0xce, 0x9c, 0xca, 0x4c, 0xc2, 0x1e, 0xf0, 0xcb, 0x2c, 0x5d, 0x09, - 0xcd, 0xd6, 0xf1, 0x69, 0x05, 0x3c, 0x39, 0xad, 0x80, 0xbf, 0x4e, 0x2b, 0xe0, 0xf1, 0xb8, 0x92, - 0x7b, 0x32, 0xae, 0xe4, 0xfe, 0x18, 0x57, 0x72, 0x9f, 0xd6, 0x63, 0x4b, 0xf8, 0x74, 0x8a, 0xba, - 0x9f, 0x63, 0x5f, 0x64, 0x11, 0xfb, 0x78, 0x67, 0x4d, 0x7c, 0xbf, 0xf1, 0x4f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x99, 0x53, 0x96, 0x76, 0x8c, 0x10, 0x00, 0x00, + // 950 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x57, 0xcd, 0x4f, 0x1b, 0x47, + 0x14, 0xf7, 0xd8, 0x40, 0xcb, 0x18, 0xd1, 0x6a, 0xb0, 0x54, 0x77, 0x5b, 0x19, 0x77, 0x11, 0x85, + 0x56, 0xf5, 0xae, 0x30, 0xf4, 0xd8, 0x22, 0x10, 0xad, 0x7b, 0x80, 0x96, 0xba, 0x85, 0x56, 0x95, + 0x1a, 0xb2, 0x5e, 0x8f, 0xd6, 0x2b, 0xd6, 0x3b, 0x8b, 0x77, 0x1c, 0x40, 0x88, 0x4b, 0x2e, 0xc9, + 0x11, 0x29, 0x7f, 0x45, 0xa4, 0x44, 0x39, 0xe5, 0x94, 0x73, 0x24, 0xa4, 0x1c, 0x82, 0x94, 0x0f, + 0xe5, 0x14, 0x45, 0xc0, 0x1f, 0x12, 0xed, 0xec, 0xec, 0x87, 0x59, 0xaf, 0x3f, 0xc0, 0x87, 0x7c, + 0xdc, 0xec, 0xb7, 0xef, 0x37, 0xef, 0xfd, 0x7e, 0xef, 0xe7, 0x9d, 0x67, 0xf8, 0x59, 0x15, 0xef, + 0xc9, 0x3b, 0x4d, 0xdc, 0xd8, 0x97, 0xac, 0x06, 0xa1, 0x04, 0x65, 0x6d, 0xac, 0xb3, 0x4f, 0x2a, + 0x31, 0x24, 0x1b, 0xeb, 0x6a, 0x4d, 0xd1, 0x4d, 0xa9, 0x8a, 0xf7, 0x84, 0x8c, 0x46, 0x34, 0xc2, + 0x1e, 0xc9, 0xce, 0x27, 0x37, 0x5f, 0xf8, 0x5a, 0x23, 0x44, 0x33, 0xb0, 0xac, 0x58, 0xba, 0xac, + 0x98, 0x26, 0xa1, 0x0a, 0xd5, 0x89, 0x69, 0xf3, 0xa7, 0xdf, 0xab, 0xc4, 0xae, 0x13, 0x5b, 0xae, + 0x28, 0x36, 0x76, 0xcb, 0xc8, 0x37, 0xe6, 0x2a, 0x98, 0x2a, 0x73, 0xb2, 0xa5, 0x68, 0xba, 0xc9, + 0x92, 0x79, 0xee, 0xe7, 0x4e, 0x2b, 0x96, 0xd2, 0x50, 0xea, 0x1e, 0x7a, 0xc2, 0x89, 0x18, 0xc4, + 0xd4, 0xb6, 0x2a, 0x84, 0x6c, 0xf3, 0x60, 0xc6, 0x09, 0xda, 0x35, 0xd2, 0xa0, 0xd1, 0x28, 0xa6, + 0xd4, 0xc0, 0x75, 0x6c, 0x52, 0x1e, 0x1d, 0x77, 0xa2, 0x74, 0x57, 0xb1, 0xf8, 0x77, 0xc6, 0x16, + 0x9b, 0x4d, 0xaf, 0x82, 0x98, 0x81, 0xe8, 0x4f, 0xa7, 0xab, 0x75, 0x56, 0xb6, 0x8c, 0x77, 0x9a, + 0xd8, 0xa6, 0xe2, 0x06, 0x9c, 0x68, 0x89, 0xda, 0x16, 0x31, 0x6d, 0x8c, 0x7e, 0x86, 0x23, 0x6e, + 0x7b, 0x59, 0x90, 0x07, 0xb3, 0xe9, 0x62, 0x5e, 0x8a, 0xd3, 0x4a, 0x72, 0x91, 0xcb, 0x43, 0xc7, + 0xaf, 0x27, 0x13, 0x65, 0x8e, 0x12, 0x5f, 0x00, 0xf8, 0x05, 0x3b, 0xb7, 0x84, 0xe9, 0x2a, 0x31, + 0xb5, 0x65, 0x42, 0xb6, 0x79, 0x49, 0x94, 0x81, 0xc3, 0x56, 0x43, 0x57, 0x31, 0x3b, 0x7a, 0xb4, + 0xec, 0x7e, 0x41, 0x22, 0x1c, 0x53, 0x89, 0x49, 0x1b, 0x8a, 0x4a, 0x97, 0xaa, 0xd5, 0x46, 0x36, + 0xc9, 0x1e, 0xb6, 0xc4, 0xd0, 0x22, 0x84, 0x2c, 0x79, 0x05, 0x9b, 0xa4, 0x9e, 0x4d, 0xe5, 0xc1, + 0xec, 0x78, 0x71, 0x32, 0xbe, 0x33, 0x96, 0x56, 0x0e, 0x41, 0x9c, 0x03, 0x14, 0xdb, 0xc6, 0xd4, + 0x3d, 0x60, 0xa8, 0xc7, 0x03, 0x02, 0x88, 0x78, 0x1d, 0x66, 0xa3, 0xb4, 0xb8, 0x66, 0x2b, 0xf0, + 0x53, 0x2f, 0xc6, 0x55, 0x13, 0xe3, 0x8f, 0xf6, 0x32, 0xb9, 0x6e, 0x3e, 0x52, 0xbc, 0x95, 0xe4, + 0xca, 0x2d, 0x19, 0xc6, 0x45, 0xe5, 0x7e, 0x85, 0x30, 0xb0, 0x12, 0xaf, 0xf1, 0xad, 0xe4, 0xfa, + 0x4e, 0x72, 0x7c, 0x27, 0xb9, 0xf6, 0xe6, 0xbe, 0x93, 0xd6, 0x15, 0x0d, 0x73, 0x6c, 0x39, 0x84, + 0x7c, 0x4f, 0xb4, 0xbe, 0x0b, 0xb8, 0xd8, 0x2d, 0x4a, 0xb4, 0x15, 0x3b, 0x75, 0x39, 0xb1, 0x51, + 0xa9, 0x45, 0xd0, 0x24, 0x13, 0x74, 0xa6, 0xab, 0xa0, 0x6e, 0x0b, 0x61, 0x45, 0xc5, 0x97, 0x20, + 0x30, 0xc6, 0x5f, 0xce, 0x0f, 0xf6, 0x43, 0x31, 0x7c, 0x15, 0x7e, 0xd9, 0x86, 0x17, 0x1f, 0x42, + 0x09, 0x8e, 0xfa, 0x41, 0x6e, 0xc7, 0xa9, 0xf8, 0xc3, 0xfd, 0x54, 0x3e, 0x86, 0x00, 0x2b, 0xde, + 0x4e, 0x06, 0xa3, 0x8e, 0xc8, 0xf7, 0x71, 0xb9, 0xfe, 0x3e, 0xe0, 0x8a, 0xb7, 0x4a, 0xd1, 0x5e, + 0xf1, 0xd4, 0x65, 0x15, 0x1f, 0x9c, 0xf3, 0xcf, 0x01, 0x14, 0x7c, 0x87, 0xf8, 0x97, 0x92, 0x77, + 0xbf, 0x44, 0x44, 0x07, 0x6d, 0x44, 0xcf, 0xc3, 0x74, 0xc5, 0x20, 0xea, 0xf6, 0x6f, 0x58, 0xd7, + 0x6a, 0x94, 0x35, 0x33, 0x54, 0x0e, 0x87, 0xde, 0x81, 0xb1, 0x18, 0xf0, 0xab, 0xb6, 0x2c, 0xf9, + 0x5c, 0xd6, 0x60, 0x3a, 0x14, 0xe6, 0x26, 0x9d, 0xee, 0x30, 0x99, 0x20, 0x99, 0xcf, 0x26, 0x8c, + 0x17, 0xab, 0x5c, 0x53, 0xc7, 0x03, 0x51, 0x4d, 0x07, 0xf4, 0x83, 0x10, 0x1f, 0x02, 0x4e, 0xea, + 0x62, 0x99, 0x38, 0x52, 0xa9, 0xab, 0x90, 0x1a, 0x9c, 0xe5, 0x1e, 0x01, 0xbe, 0xb4, 0x94, 0x30, + 0xfd, 0x7b, 0x57, 0xb1, 0x3c, 0x5d, 0x5a, 0x5d, 0x02, 0xae, 0xea, 0x92, 0x64, 0xdf, 0x2e, 0x89, + 0xb8, 0x3d, 0x15, 0x75, 0xbb, 0xb8, 0x0a, 0x33, 0xad, 0xcd, 0x73, 0xb5, 0x17, 0xe0, 0xb0, 0xb3, + 0xbe, 0x79, 0xe6, 0xc9, 0xc5, 0xd7, 0x65, 0x30, 0x37, 0xb9, 0xf8, 0x18, 0xc2, 0x61, 0x76, 0x1c, + 0x3a, 0x02, 0x70, 0xc4, 0xdd, 0xc5, 0xd0, 0x0f, 0xf1, 0xd8, 0xe8, 0x0a, 0x28, 0x14, 0x7a, 0xcc, + 0x76, 0xfb, 0x14, 0xbf, 0xbb, 0xf9, 0xec, 0xfc, 0x4e, 0x72, 0x0a, 0x7d, 0x23, 0xdb, 0x58, 0x2f, + 0x78, 0x38, 0xd9, 0xc3, 0xc9, 0xc1, 0x6a, 0x8b, 0x4e, 0x40, 0x70, 0x4b, 0xa3, 0xb9, 0x2e, 0x65, + 0xa2, 0x9b, 0xa2, 0x50, 0xec, 0x07, 0xc2, 0xdb, 0xfb, 0x9f, 0xb5, 0xf7, 0x0f, 0xda, 0xe8, 0xd0, + 0x9e, 0xbf, 0x67, 0xcb, 0x07, 0xe1, 0xd1, 0x1c, 0xca, 0x07, 0x81, 0x19, 0x0e, 0xe5, 0x83, 0x60, + 0xb0, 0xde, 0x93, 0x43, 0xf4, 0x04, 0xc0, 0xb4, 0x57, 0x73, 0xc9, 0x30, 0xba, 0xb2, 0x8a, 0x6e, + 0x71, 0x5d, 0x59, 0xb5, 0x59, 0x77, 0xc4, 0x0d, 0xc6, 0xea, 0x0f, 0xb4, 0x36, 0x50, 0x56, 0xe8, + 0x39, 0x08, 0xdd, 0x27, 0xa8, 0x07, 0xb9, 0x2f, 0x5e, 0xce, 0xc2, 0x7c, 0x5f, 0x18, 0xce, 0xe6, + 0x1a, 0x63, 0xf3, 0x2f, 0xda, 0xec, 0xc0, 0x26, 0xf8, 0xdb, 0xd3, 0xff, 0x90, 0x9e, 0x02, 0x38, + 0xe6, 0x57, 0x75, 0xa6, 0xd4, 0x83, 0xe4, 0x7d, 0x33, 0x6b, 0x77, 0x3f, 0x8b, 0x9b, 0x8c, 0xd9, + 0x3a, 0xfa, 0x7d, 0xb0, 0xcc, 0xd0, 0x3d, 0x00, 0xc7, 0x43, 0xef, 0x52, 0x87, 0xd3, 0x42, 0x0f, + 0xfd, 0x45, 0xee, 0x0e, 0xe1, 0xc7, 0x3e, 0x51, 0x9c, 0x57, 0x81, 0xf1, 0x9a, 0x41, 0xd3, 0x9d, + 0x78, 0xf9, 0x38, 0xf4, 0x00, 0xc0, 0x4f, 0xf8, 0xfb, 0x0d, 0x15, 0xba, 0x3b, 0x24, 0xf4, 0x12, + 0x17, 0xa4, 0x5e, 0xd3, 0x79, 0x67, 0xbf, 0xb0, 0xce, 0x16, 0xd1, 0x4f, 0x1d, 0x3a, 0xd3, 0x30, + 0xdd, 0x72, 0x5e, 0x97, 0xf1, 0x02, 0x2f, 0x97, 0x8e, 0x4f, 0x73, 0xe0, 0xe4, 0x34, 0x07, 0xde, + 0x9c, 0xe6, 0xc0, 0xd1, 0x59, 0x2e, 0x71, 0x72, 0x96, 0x4b, 0xbc, 0x3a, 0xcb, 0x25, 0xfe, 0x2b, + 0x68, 0x3a, 0xad, 0x35, 0x2b, 0x92, 0x4a, 0xea, 0x91, 0x12, 0x05, 0xb7, 0xc6, 0x1e, 0xab, 0x42, + 0xf7, 0x2d, 0x6c, 0x57, 0x46, 0xd8, 0xf3, 0xf9, 0xb7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x53, 0x51, + 0x3f, 0x93, 0x6e, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1364,16 +1375,13 @@ func (m *QueryGetLongBookRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x12 } - { - size := m.Price.Size() - i -= size - if _, err := m.Price.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + if len(m.Price) > 0 { + i -= len(m.Price) + copy(dAtA[i:], m.Price) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Price))) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1548,16 +1556,13 @@ func (m *QueryGetShortBookRequest) MarshalToSizedBuffer(dAtA []byte) (int, error i-- dAtA[i] = 0x12 } - { - size := m.Price.Size() - i -= size - if _, err := m.Price.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + if len(m.Price) > 0 { + i -= len(m.Price) + copy(dAtA[i:], m.Price) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Price))) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1969,8 +1974,10 @@ func (m *QueryGetLongBookRequest) Size() (n int) { } var l int _ = l - l = m.Price.Size() - n += 1 + l + sovQuery(uint64(l)) + l = len(m.Price) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } l = len(m.ContractAddr) if l > 0 { n += 1 + l + sovQuery(uint64(l)) @@ -2043,8 +2050,10 @@ func (m *QueryGetShortBookRequest) Size() (n int) { } var l int _ = l - l = m.Price.Size() - n += 1 + l + sovQuery(uint64(l)) + l = len(m.Price) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } l = len(m.ContractAddr) if l > 0 { n += 1 + l + sovQuery(uint64(l)) @@ -2406,9 +2415,7 @@ func (m *QueryGetLongBookRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Price.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Price = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -2919,9 +2926,7 @@ func (m *QueryGetShortBookRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Price.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Price = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { diff --git a/x/dex/types/query.pb.gw.go b/x/dex/types/query.pb.gw.go index 74d62ff812..72a078cbd9 100644 --- a/x/dex/types/query.pb.gw.go +++ b/x/dex/types/query.pb.gw.go @@ -51,10 +51,6 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } -var ( - filter_Query_LongBook_0 = &utilities.DoubleArray{Encoding: map[string]int{"contractAddr": 0, "priceDenom": 1, "assetDenom": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} -) - func request_Query_LongBook_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryGetLongBookRequest var metadata runtime.ServerMetadata @@ -104,11 +100,15 @@ func request_Query_LongBook_0(ctx context.Context, marshaler runtime.Marshaler, protoReq.AssetDenom = Denom(e) - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["price"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "price") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_LongBook_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Price, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "price", err) } msg, err := client.LongBook(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -165,11 +165,15 @@ func local_request_Query_LongBook_0(ctx context.Context, marshaler runtime.Marsh protoReq.AssetDenom = Denom(e) - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["price"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "price") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_LongBook_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Price, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "price", err) } msg, err := server.LongBook(ctx, &protoReq) @@ -178,13 +182,58 @@ func local_request_Query_LongBook_0(ctx context.Context, marshaler runtime.Marsh } var ( - filter_Query_LongBookAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_LongBookAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"contractAddr": 0, "priceDenom": 1, "assetDenom": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} ) func request_Query_LongBookAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllLongBookRequest var metadata runtime.ServerMetadata + var ( + val string + e int32 + ok bool + err error + _ = err + ) + + val, ok = pathParams["contractAddr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "contractAddr") + } + + protoReq.ContractAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "contractAddr", err) + } + + val, ok = pathParams["priceDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "priceDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "priceDenom", err) + } + + protoReq.PriceDenom = Denom(e) + + val, ok = pathParams["assetDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "assetDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "assetDenom", err) + } + + protoReq.AssetDenom = Denom(e) + if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -201,6 +250,51 @@ func local_request_Query_LongBookAll_0(ctx context.Context, marshaler runtime.Ma var protoReq QueryAllLongBookRequest var metadata runtime.ServerMetadata + var ( + val string + e int32 + ok bool + err error + _ = err + ) + + val, ok = pathParams["contractAddr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "contractAddr") + } + + protoReq.ContractAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "contractAddr", err) + } + + val, ok = pathParams["priceDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "priceDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "priceDenom", err) + } + + protoReq.PriceDenom = Denom(e) + + val, ok = pathParams["assetDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "assetDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "assetDenom", err) + } + + protoReq.AssetDenom = Denom(e) + if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -213,10 +307,6 @@ func local_request_Query_LongBookAll_0(ctx context.Context, marshaler runtime.Ma } -var ( - filter_Query_ShortBook_0 = &utilities.DoubleArray{Encoding: map[string]int{"contractAddr": 0, "priceDenom": 1, "assetDenom": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} -) - func request_Query_ShortBook_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryGetShortBookRequest var metadata runtime.ServerMetadata @@ -266,11 +356,15 @@ func request_Query_ShortBook_0(ctx context.Context, marshaler runtime.Marshaler, protoReq.AssetDenom = Denom(e) - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["price"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "price") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ShortBook_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Price, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "price", err) } msg, err := client.ShortBook(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -327,11 +421,15 @@ func local_request_Query_ShortBook_0(ctx context.Context, marshaler runtime.Mars protoReq.AssetDenom = Denom(e) - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + val, ok = pathParams["price"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "price") } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_ShortBook_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + + protoReq.Price, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "price", err) } msg, err := server.ShortBook(ctx, &protoReq) @@ -340,13 +438,58 @@ func local_request_Query_ShortBook_0(ctx context.Context, marshaler runtime.Mars } var ( - filter_Query_ShortBookAll_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} + filter_Query_ShortBookAll_0 = &utilities.DoubleArray{Encoding: map[string]int{"contractAddr": 0, "priceDenom": 1, "assetDenom": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}} ) func request_Query_ShortBookAll_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryAllShortBookRequest var metadata runtime.ServerMetadata + var ( + val string + e int32 + ok bool + err error + _ = err + ) + + val, ok = pathParams["contractAddr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "contractAddr") + } + + protoReq.ContractAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "contractAddr", err) + } + + val, ok = pathParams["priceDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "priceDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "priceDenom", err) + } + + protoReq.PriceDenom = Denom(e) + + val, ok = pathParams["assetDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "assetDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "assetDenom", err) + } + + protoReq.AssetDenom = Denom(e) + if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -363,6 +506,51 @@ func local_request_Query_ShortBookAll_0(ctx context.Context, marshaler runtime.M var protoReq QueryAllShortBookRequest var metadata runtime.ServerMetadata + var ( + val string + e int32 + ok bool + err error + _ = err + ) + + val, ok = pathParams["contractAddr"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "contractAddr") + } + + protoReq.ContractAddr, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "contractAddr", err) + } + + val, ok = pathParams["priceDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "priceDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "priceDenom", err) + } + + protoReq.PriceDenom = Denom(e) + + val, ok = pathParams["assetDenom"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "assetDenom") + } + + e, err = runtime.Enum(val, Denom_value) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "assetDenom", err) + } + + protoReq.AssetDenom = Denom(e) + if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -869,13 +1057,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"sei-protocol", "seichain", "dex", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_LongBook_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"sei-protocol", "seichain", "dex", "long_book", "contractAddr", "priceDenom", "assetDenom"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LongBook_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"sei-protocol", "seichain", "dex", "long_book", "contractAddr", "priceDenom", "assetDenom", "price"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_LongBookAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"sei-protocol", "seichain", "dex", "long_book"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_LongBookAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"sei-protocol", "seichain", "dex", "long_book", "contractAddr", "priceDenom", "assetDenom"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ShortBook_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"sei-protocol", "seichain", "dex", "short_book", "contractAddr", "priceDenom", "assetDenom"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ShortBook_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6, 1, 0, 4, 1, 5, 7}, []string{"sei-protocol", "seichain", "dex", "short_book", "contractAddr", "priceDenom", "assetDenom", "price"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ShortBookAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"sei-protocol", "seichain", "dex", "short_book"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ShortBookAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"sei-protocol", "seichain", "dex", "short_book", "contractAddr", "priceDenom", "assetDenom"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_SettlementsAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"sei-protocol", "seichain", "dex", "settlement"}, "", runtime.AssumeColonVerbOpt(true)))