From 02e28d60902aea5266c16cdd9942f49f970f7e23 Mon Sep 17 00:00:00 2001 From: albertchon Date: Tue, 15 Dec 2020 05:34:18 -0800 Subject: [PATCH] upd types --- chain/orders/types/codec.go | 2 - chain/orders/types/errors.go | 38 +- chain/orders/types/events.go | 4 + chain/orders/types/msgs.go | 228 +-- chain/orders/types/orders.pb.go | 3352 +++++++++++-------------------- chain/orders/types/query.pb.go | 3213 +++++++---------------------- chain/orders/types/types.go | 31 +- 7 files changed, 2045 insertions(+), 4823 deletions(-) diff --git a/chain/orders/types/codec.go b/chain/orders/types/codec.go index 92e3e220..d8c2d28b 100644 --- a/chain/orders/types/codec.go +++ b/chain/orders/types/codec.go @@ -27,7 +27,5 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { &MsgSuspendSpotMarket{}, &MsgResumeSpotMarket{}, &MsgCreateSpotOrder{}, - &MsgRequestFillSpotOrder{}, - &MsgRequestSoftCancelSpotOrder{}, ) } diff --git a/chain/orders/types/errors.go b/chain/orders/types/errors.go index d11883d2..837c04e3 100644 --- a/chain/orders/types/errors.go +++ b/chain/orders/types/errors.go @@ -5,21 +5,25 @@ import ( ) var ( - ErrOrderInvalid = sdkerrors.Register(ModuleName, 1, "failed to validate order") - ErrOrderNotFound = sdkerrors.Register(ModuleName, 2, "no active order found for the hash") - ErrPairSuspended = sdkerrors.Register(ModuleName, 3, "trade pair suspended") - ErrPairNotFound = sdkerrors.Register(ModuleName, 4, "trade pair not found") - ErrPairExists = sdkerrors.Register(ModuleName, 5, "trade pair exists") - ErrPairMismatch = sdkerrors.Register(ModuleName, 6, "trade pair mismatch") - ErrBadField = sdkerrors.Register(ModuleName, 7, "struct field error") - ErrMarketNotFound = sdkerrors.Register(ModuleName, 8, "derivative market not found") - ErrMarketInvalid = sdkerrors.Register(ModuleName, 9, "failed to validate derivative market") - ErrMarketExists = sdkerrors.Register(ModuleName, 10, "market exists") - ErrMarketSuspended = sdkerrors.Register(ModuleName, 11, "market suspended") - ErrBadUpdateEvent = sdkerrors.Register(ModuleName, 12, "order update event not confirmed") - ErrUpdateSameValue = sdkerrors.Register(ModuleName, 13, "cannot update the record's field with the same value") - ErrOverLeveragedOrder = sdkerrors.Register(ModuleName, 14, "cannot add overlevered order") - ErrSubaccountNotFound = sdkerrors.Register(ModuleName, 15, "subaccount not found") - ErrOrderAlreadyExists = sdkerrors.Register(ModuleName, 16, "order already exists") - ErrInsufficientMargin = sdkerrors.Register(ModuleName, 17, "subaccount has insufficient margin") + ErrOrderInvalid = sdkerrors.Register(ModuleName, 1, "failed to validate order") + ErrOrderNotFound = sdkerrors.Register(ModuleName, 2, "no active order found for the hash") + ErrPairSuspended = sdkerrors.Register(ModuleName, 3, "trade pair suspended") + ErrPairNotFound = sdkerrors.Register(ModuleName, 4, "trade pair not found") + ErrPairExists = sdkerrors.Register(ModuleName, 5, "trade pair exists") + ErrPairMismatch = sdkerrors.Register(ModuleName, 6, "trade pair mismatch") + ErrBadField = sdkerrors.Register(ModuleName, 7, "struct field error") + ErrMarketNotFound = sdkerrors.Register(ModuleName, 8, "derivative market not found") + ErrMarketInvalid = sdkerrors.Register(ModuleName, 9, "failed to validate derivative market") + ErrMarketExists = sdkerrors.Register(ModuleName, 10, "market exists") + ErrMarketSuspended = sdkerrors.Register(ModuleName, 11, "market suspended") + ErrBadUpdateEvent = sdkerrors.Register(ModuleName, 12, "order update event not confirmed") + ErrUpdateSameValue = sdkerrors.Register(ModuleName, 13, "cannot update the record's field with the same value") + ErrOverLeveragedOrder = sdkerrors.Register(ModuleName, 14, "cannot add overlevered order") + ErrSubaccountNotFound = sdkerrors.Register(ModuleName, 15, "subaccount not found") + ErrOrderAlreadyExists = sdkerrors.Register(ModuleName, 16, "order already exists") + ErrInsufficientMargin = sdkerrors.Register(ModuleName, 17, "subaccount has insufficient margin") + ErrMarketExpired = sdkerrors.Register(ModuleName, 18, "market has already expired") + ErrOrderExpired = sdkerrors.Register(ModuleName, 19, "order has already expired") + ErrInsufficientOrderQuantity = sdkerrors.Register(ModuleName, 20, "order quantity invalid") + ErrUnrecognizedOrderType = sdkerrors.Register(ModuleName, 21, "unrecognized order type") ) diff --git a/chain/orders/types/events.go b/chain/orders/types/events.go index b9f1d1a4..82fbb8a0 100644 --- a/chain/orders/types/events.go +++ b/chain/orders/types/events.go @@ -9,10 +9,14 @@ const ( EventTypeFillDerivativeOrder = "fill_derivative_order" EventTypeHardCancelSpotOrder = "hard_cancel_spot_order" EventTypeFillSpotOrder = "fill_spot_order" + EventTypeSetPrice = "set_price" AttributeKeyOrderHash = "order_hash" AttributeKeyMarketID = "market_id" + AttributeKeySubaccountID = "subaccount_id" AttributeKeyTradePairHash = "trade_pair_hash" AttributeKeySignedOrder = "signed_order" AttributeKeyFilledAmount = "filled_amount" + AttributeKeyPrice = "price" + AttributeKeyTicker = "ticker" ) diff --git a/chain/orders/types/msgs.go b/chain/orders/types/msgs.go index 10a39f5e..ba17838a 100644 --- a/chain/orders/types/msgs.go +++ b/chain/orders/types/msgs.go @@ -4,10 +4,10 @@ import ( "bytes" "errors" "fmt" + "github.com/ethereum/go-ethereum/crypto" "math/big" "strings" - - "github.com/ethereum/go-ethereum/crypto" + "time" "github.com/ethereum/go-ethereum/common" @@ -29,9 +29,6 @@ var ( _ sdk.Msg = &MsgSuspendSpotMarket{} _ sdk.Msg = &MsgResumeSpotMarket{} _ sdk.Msg = &MsgCreateSpotOrder{} - _ sdk.Msg = &MsgRequestFillSpotOrder{} - _ sdk.Msg = &MsgRequestSoftCancelSpotOrder{} - _ sdk.Msg = &MsgExecuteTakerTransaction{} ) // Route should return the name of the module @@ -46,12 +43,15 @@ func (msg MsgCreateSpotOrder) ValidateBasic() error { return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, msg.Sender) } + quantity := BigNum(msg.Order.GetTakerAssetAmount()).Int() if msg.Order == nil { return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "no make order specified") } else if _, err := msg.Order.ToSignedOrder().ComputeOrderHash(); err != nil { return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, fmt.Sprintf("hash check failed: %v", err)) } else if !isValidSignature(msg.Order.Signature) { return sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "invalid signature") + } else if quantity == nil || quantity.Cmp(big.NewInt(0)) <= 0 { + return sdkerrors.Wrap(ErrInsufficientOrderQuantity, "insufficient quantity") } return nil @@ -145,98 +145,6 @@ func (msg MsgCreateDerivativeOrder) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sender} } -// Route should return the name of the module -func (msg MsgRequestFillSpotOrder) Route() string { return RouterKey } - -// Type should return the action -func (msg MsgRequestFillSpotOrder) Type() string { return "requestFillSpotOrder" } - -// ValidateBasic runs stateless checks on the message -func (msg MsgRequestFillSpotOrder) ValidateBasic() error { - if msg.Sender == "" { - return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, msg.Sender) - } - - if msg.TxOrigin == "" { - return sdkerrors.Wrap(ErrBadField, "no txOrigin address specified") - } else if len(msg.SignedTransaction.Salt) == 0 { - return sdkerrors.Wrap(ErrBadField, "no salt specified") - } else if msg.SignedTransaction.SignerAddress == "" { - return sdkerrors.Wrap(ErrBadField, "no signerAddress address specified") - } else if msg.SignedTransaction.Domain.VerifyingContract == "" { - return sdkerrors.Wrap(ErrBadField, "no verifyingContract address specified") - } else if len(msg.SignedTransaction.Domain.ChainId) == 0 { - return sdkerrors.Wrap(ErrBadField, "no chainID specified") - } else if len(msg.SignedTransaction.GasPrice) == 0 { - return sdkerrors.Wrap(ErrBadField, "no gasPrice specified") - } else if len(msg.SignedTransaction.ExpirationTimeSeconds) == 0 { - return sdkerrors.Wrap(ErrBadField, "no expirationTimeSeconds specified") - } else if !isValidSignature(msg.SignedTransaction.Signature) { - return sdkerrors.Wrap(ErrBadField, "invalid transaction signature") - } else if !isValidSignature(msg.ApprovalSignature) { - return sdkerrors.Wrap(ErrBadField, "invalid approval signature") - } - - return nil -} - -// GetSignBytes encodes the message for signing -func (msg *MsgRequestFillSpotOrder) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) -} - -// GetSigners defines whose signature is required -func (msg MsgRequestFillSpotOrder) GetSigners() []sdk.AccAddress { - sender, err := sdk.AccAddressFromBech32(msg.Sender) - if err != nil { - panic(err) - } - return []sdk.AccAddress{sender} -} - -// Route should return the name of the module -func (msg MsgRequestSoftCancelSpotOrder) Route() string { return RouterKey } - -// Type should return the action -func (msg MsgRequestSoftCancelSpotOrder) Type() string { return "softCancelSpotOrder" } - -// ValidateBasic runs stateless checks on the message -func (msg MsgRequestSoftCancelSpotOrder) ValidateBasic() error { - if msg.Sender == "" { - return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, msg.Sender) - } - if msg.TxOrigin == "" { - return sdkerrors.Wrap(ErrBadField, "no txOrigin address specified") - } else if len(msg.SignedTransaction.Salt) == 0 { - return sdkerrors.Wrap(ErrBadField, "no salt specified") - } else if msg.SignedTransaction.SignerAddress == "" { - return sdkerrors.Wrap(ErrBadField, "no signerAddress address specified") - } else if msg.SignedTransaction.Domain.VerifyingContract == "" { - return sdkerrors.Wrap(ErrBadField, "no verifyingContract address specified") - } else if len(msg.SignedTransaction.Domain.ChainId) == 0 { - return sdkerrors.Wrap(ErrBadField, "no chainID specified") - } else if len(msg.SignedTransaction.GasPrice) == 0 { - return sdkerrors.Wrap(ErrBadField, "no gasPrice specified") - } else if !isValidSignature(msg.SignedTransaction.Signature) { - return sdkerrors.Wrap(ErrBadField, "invalid signature") - } - return nil -} - -// GetSignBytes encodes the message for signing -func (msg *MsgRequestSoftCancelSpotOrder) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) -} - -// GetSigners defines whose signature is required -func (msg MsgRequestSoftCancelSpotOrder) GetSigners() []sdk.AccAddress { - sender, err := sdk.AccAddressFromBech32(msg.Sender) - if err != nil { - panic(err) - } - return []sdk.AccAddress{sender} -} - // Route should return the name of the module func (msg MsgRegisterSpotMarket) Route() string { return RouterKey } @@ -460,31 +368,6 @@ func (msg MsgResumeSpotMarket) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sender} } -// Route should return the name of the module -func (msg MsgExecuteTakerTransaction) Route() string { return RouterKey } - -// Type should return the action -func (msg MsgExecuteTakerTransaction) Type() string { return "executeTakerTransaction" } - -// ValidateBasic runs stateless checks on the message -func (msg MsgExecuteTakerTransaction) ValidateBasic() error { - // TODO : Add basic vaidation - return nil -} - -func (msg *MsgExecuteTakerTransaction) GetSignBytes() []byte { - return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(msg)) -} - -// GetSigners defines whose signature is required -func (msg MsgExecuteTakerTransaction) GetSigners() []sdk.AccAddress { - sender, err := sdk.AccAddressFromBech32(msg.Sender) - if err != nil { - panic(err) - } - return []sdk.AccAddress{sender} -} - // SafeSignedOrder is a special signed order structure // for including in Msgs, because it consists of primitive types. // Avoid using raw *big.Int in Msgs. @@ -547,8 +430,99 @@ func (m *BaseOrder) ToSignedOrder() *zeroex.SignedOrder { return o } -func ComputeSubaccountID(makerAddress string, takerFee string) (subaccountID common.Hash) { - subaccountID = crypto.Keccak256Hash( +func (order *Order) DoesValidationPass(isLong bool, market *DerivativeMarket, currBlockTime time.Time) error { + err := order.ComputeAndSetOrderType() + if err != nil { + return err + } + orderExpirationTime := BigNum(order.GetOrder().GetExpirationTimeSeconds()).Int() + blockTime := big.NewInt(currBlockTime.Unix()) + + if orderExpirationTime.Cmp(blockTime) <= 0 { + return sdkerrors.Wrapf(ErrOrderExpired, "order expiration %s <= block time %s", orderExpirationTime.String(), blockTime.String()) + } + margin := BigNum(order.Order.GetMakerFee()).Int() + contractPriceMarginRequirement := order.ComputeContractPriceMarginRequirement(market) + if margin.Cmp(contractPriceMarginRequirement) < 0 { + return sdkerrors.Wrapf(ErrOverLeveragedOrder, "margin %s < contractPriceMarginRequirement %s", margin.String(), contractPriceMarginRequirement.String()) + } + + indexPriceMarginRequirement := order.ComputeIndexPriceMarginRequirement(isLong, market) + indexPrice := BigNum(market.GetIndexPrice()).Int() + + if isLong && indexPrice.Cmp(indexPriceMarginRequirement) < 0 { + return sdkerrors.Wrapf(ErrOverLeveragedOrder, "indexPrice %s <= indexPriceReq %s", market.GetIndexPrice(), order.IndexPriceRequirement) + } else if !isLong && indexPrice.Cmp(indexPriceMarginRequirement) > 0 { + return sdkerrors.Wrapf(ErrOverLeveragedOrder, "indexPrice %s >= indexPriceReq %s", market.GetIndexPrice(), order.IndexPriceRequirement) + } + return nil +} + +func (order *Order) ComputeAndSetOrderType() error { + orderTypeNumber := new(big.Int).SetBytes(common.FromHex(order.GetOrder().GetMakerFeeAssetData())[:common.HashLength]).Uint64() + if orderTypeNumber != 0 && orderTypeNumber != 5 { + return sdkerrors.Wrapf(ErrUnrecognizedOrderType, "Cannot recognize MakerFeeAssetData of %s", order.GetOrder().GetMakerFeeAssetData()) + } + order.OrderType = orderTypeNumber + return nil +} + +func (order *Order) ComputeIndexPriceMarginRequirement(isLong bool, market *DerivativeMarket) *big.Int { + price := BigNum(order.Order.GetMakerAssetAmount()).Int() + quantity := BigNum(order.Order.GetTakerAssetAmount()).Int() + margin := BigNum(order.Order.GetMakerFee()).Int() + pq := new(big.Int).Mul(price, quantity) + alphaQuantity := ScalePermyriad(quantity, BigNum(market.InitialMarginRatio).Int()) + num := new(big.Int) + denom := new(big.Int) + + if isLong { + num = num.Sub(margin, pq) + denom = denom.Sub(alphaQuantity, quantity) + } else { + num = num.Add(margin, pq) + denom = denom.Add(alphaQuantity, quantity) + } + + indexPriceReq := new(big.Int).Div(num, denom) + order.IndexPriceRequirement = indexPriceReq.String() + return indexPriceReq +} + +// quantity * initialMarginRatio * price +func (order *Order) ComputeContractPriceMarginRequirement(market *DerivativeMarket) *big.Int { + price := BigNum(order.Order.GetMakerAssetAmount()).Int() + quantity := BigNum(order.Order.GetTakerAssetAmount()).Int() + alphaQuantity := ScalePermyriad(quantity, BigNum(market.InitialMarginRatio).Int()) + return new(big.Int).Mul(alphaQuantity, price) +} + +// orderMarginHold = 1.0015 * margin * (remainingQuantity) / order.quantity +func (o *Order) ComputeOrderMarginHold(remainingQuantity, makerTxFeePermyriad *big.Int) (orderMarginHold *big.Int) { + margin := BigNum(o.GetOrder().GetMakerFee()).Int() + scaledMargin := IncrementByScaledPermyriad(margin, makerTxFeePermyriad) + originalQuantity := BigNum(o.GetOrder().GetTakerAssetAmount()).Int() + + // TODO: filledAmount should always be zero with TEC since there will be no UnknownOrderHash + numerator := new(big.Int).Mul(scaledMargin, remainingQuantity) + orderMarginHold = new(big.Int).Div(numerator, originalQuantity) + return orderMarginHold +} + +// return amount * (1 + permyriad/10000) = (amount + amount * permyriad/10000) +func IncrementByScaledPermyriad(amount, permyriad *big.Int) *big.Int { + return new(big.Int).Add(amount, ScalePermyriad(amount, permyriad)) +} + +// return (amount * permyriad) / 10000 +func ScalePermyriad(amount, permyriad *big.Int) *big.Int { + PERMYRIAD_BASE := BigNum("10000").Int() + scaleFactor := new(big.Int).Mul(amount, permyriad) + return new(big.Int).Div(scaleFactor, PERMYRIAD_BASE) +} + +func ComputeSubaccountID(makerAddress string, takerFee string) common.Hash { + subaccountID := crypto.Keccak256Hash( common.HexToAddress(makerAddress).Bytes(), common.LeftPadBytes(BigNum(takerFee).Int().Bytes(), 32), ) @@ -557,7 +531,7 @@ func ComputeSubaccountID(makerAddress string, takerFee string) (subaccountID com } // GetDirectionMarketAndSubaccountID -func (m *BaseOrder) GetDirectionMarketAndSubaccountID() (isLong bool, marketID string, subaccountID common.Hash) { +func (m *BaseOrder) GetDirectionMarketAndSubaccountID() (isLong bool, marketID common.Hash, subaccountID common.Hash) { mData, tData := common.FromHex(m.GetMakerAssetData()), common.FromHex(m.GetTakerAssetData()) if len(mData) > common.HashLength { @@ -570,10 +544,10 @@ func (m *BaseOrder) GetDirectionMarketAndSubaccountID() (isLong bool, marketID s if bytes.Equal(tData, common.Hash{}.Bytes()) { isLong = true - marketID = common.Bytes2Hex(mData) + marketID = common.BytesToHash(mData) } else { isLong = false - marketID = common.Bytes2Hex(tData) + marketID = common.BytesToHash(tData) } subaccountID = ComputeSubaccountID(m.GetMakerAddress(), m.GetTakerFee()) diff --git a/chain/orders/types/orders.pb.go b/chain/orders/types/orders.pb.go index f5ded56c..2f125dbe 100644 --- a/chain/orders/types/orders.pb.go +++ b/chain/orders/types/orders.pb.go @@ -5,12 +5,11 @@ package types import ( fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" - - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. @@ -24,6 +23,50 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +// Params defines the parameters for the orders module. +type Params struct { + FuturesEnabled []string `protobuf:"bytes,1,rep,name=futures_enabled,json=futuresEnabled,proto3" json:"futures_enabled,omitempty" yaml:"futures_enabled,omitempty"` +} + +func (m *Params) Reset() { *m = Params{} } +func (*Params) ProtoMessage() {} +func (*Params) Descriptor() ([]byte, []int) { + return fileDescriptor_cf94b0bf3cc7fbf1, []int{0} +} +func (m *Params) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Params.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 *Params) XXX_Merge(src proto.Message) { + xxx_messageInfo_Params.Merge(m, src) +} +func (m *Params) XXX_Size() int { + return m.Size() +} +func (m *Params) XXX_DiscardUnknown() { + xxx_messageInfo_Params.DiscardUnknown(m) +} + +var xxx_messageInfo_Params proto.InternalMessageInfo + +func (m *Params) GetFuturesEnabled() []string { + if m != nil { + return m.FuturesEnabled + } + return nil +} + // An object describing a derivative market in the Injective Futures Protocol. type DerivativeMarket struct { // Ticker for the derivative contract. @@ -44,17 +87,27 @@ type DerivativeMarket struct { PriceFactor string `protobuf:"bytes,8,opt,name=price_factor,json=priceFactor,proto3" json:"price_factor,omitempty"` // index price IndexPrice string `protobuf:"bytes,9,opt,name=index_price,json=indexPrice,proto3" json:"index_price,omitempty"` - // initial margin ratio + // InitialMarginRatioPermyriad InitialMarginRatio string `protobuf:"bytes,10,opt,name=initial_margin_ratio,json=initialMarginRatio,proto3" json:"initial_margin_ratio,omitempty"` - // maintenance margin ratio + // MaintenanceMarginRatioPermyriad MaintenanceMarginRatio string `protobuf:"bytes,11,opt,name=maintenance_margin_ratio,json=maintenanceMarginRatio,proto3" json:"maintenance_margin_ratio,omitempty"` + // MakerTxFeePermyriad + MakerTxFee string `protobuf:"bytes,12,opt,name=maker_tx_fee,json=makerTxFee,proto3" json:"maker_tx_fee,omitempty"` + // TakerTxFeePermyriad + TakerTxFee string `protobuf:"bytes,13,opt,name=taker_tx_fee,json=takerTxFee,proto3" json:"taker_tx_fee,omitempty"` + // NextFundingTimestamp in seconds + NextFundingTimestamp string `protobuf:"bytes,14,opt,name=next_funding_timestamp,json=nextFundingTimestamp,proto3" json:"next_funding_timestamp,omitempty"` + // FundingInterval in seconds + FundingInterval string `protobuf:"bytes,15,opt,name=funding_interval,json=fundingInterval,proto3" json:"funding_interval,omitempty"` + // Cumulative Funding in seconds + CumulativeFunding string `protobuf:"bytes,16,opt,name=cumulative_funding,json=cumulativeFunding,proto3" json:"cumulative_funding,omitempty"` } func (m *DerivativeMarket) Reset() { *m = DerivativeMarket{} } func (m *DerivativeMarket) String() string { return proto.CompactTextString(m) } func (*DerivativeMarket) ProtoMessage() {} func (*DerivativeMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{0} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{1} } func (m *DerivativeMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -160,6 +213,41 @@ func (m *DerivativeMarket) GetMaintenanceMarginRatio() string { return "" } +func (m *DerivativeMarket) GetMakerTxFee() string { + if m != nil { + return m.MakerTxFee + } + return "" +} + +func (m *DerivativeMarket) GetTakerTxFee() string { + if m != nil { + return m.TakerTxFee + } + return "" +} + +func (m *DerivativeMarket) GetNextFundingTimestamp() string { + if m != nil { + return m.NextFundingTimestamp + } + return "" +} + +func (m *DerivativeMarket) GetFundingInterval() string { + if m != nil { + return m.FundingInterval + } + return "" +} + +func (m *DerivativeMarket) GetCumulativeFunding() string { + if m != nil { + return m.CumulativeFunding + } + return "" +} + // An object describing trade pair of two assets. type TradePair struct { // A name of the pair in format AAA/BBB, where AAA - maker's asset, BBB - @@ -181,7 +269,7 @@ func (m *TradePair) Reset() { *m = TradePair{} } func (m *TradePair) String() string { return proto.CompactTextString(m) } func (*TradePair) ProtoMessage() {} func (*TradePair) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{1} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{2} } func (m *TradePair) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -295,7 +383,7 @@ func (m *BaseOrder) Reset() { *m = BaseOrder{} } func (m *BaseOrder) String() string { return proto.CompactTextString(m) } func (*BaseOrder) ProtoMessage() {} func (*BaseOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{2} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{3} } func (m *BaseOrder) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -451,13 +539,15 @@ type Order struct { Status int64 `protobuf:"zigzag64,4,opt,name=status,proto3" json:"status,omitempty"` IndexPriceRequirement string `protobuf:"bytes,5,opt,name=index_price_requirement,json=indexPriceRequirement,proto3" json:"index_price_requirement,omitempty"` SubaccountID string `protobuf:"bytes,6,opt,name=subaccount_i_d,json=subaccountID,proto3" json:"subaccount_i_d,omitempty"` + OrderType uint64 `protobuf:"varint,7,opt,name=order_type,json=orderType,proto3" json:"order_type,omitempty"` + TriggerPrice string `protobuf:"bytes,8,opt,name=trigger_price,json=triggerPrice,proto3" json:"trigger_price,omitempty"` } func (m *Order) Reset() { *m = Order{} } func (m *Order) String() string { return proto.CompactTextString(m) } func (*Order) ProtoMessage() {} func (*Order) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{3} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{4} } func (m *Order) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -528,6 +618,141 @@ func (m *Order) GetSubaccountID() string { return "" } +func (m *Order) GetOrderType() uint64 { + if m != nil { + return m.OrderType + } + return 0 +} + +func (m *Order) GetTriggerPrice() string { + if m != nil { + return m.TriggerPrice + } + return "" +} + +// An subaccount's margin info for a given base currency +type MarginInfo struct { + MarginHold string `protobuf:"bytes,1,opt,name=margin_hold,json=marginHold,proto3" json:"margin_hold,omitempty"` + TotalDeposits string `protobuf:"bytes,2,opt,name=total_deposits,json=totalDeposits,proto3" json:"total_deposits,omitempty"` +} + +func (m *MarginInfo) Reset() { *m = MarginInfo{} } +func (m *MarginInfo) String() string { return proto.CompactTextString(m) } +func (*MarginInfo) ProtoMessage() {} +func (*MarginInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_cf94b0bf3cc7fbf1, []int{5} +} +func (m *MarginInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MarginInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MarginInfo.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 *MarginInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_MarginInfo.Merge(m, src) +} +func (m *MarginInfo) XXX_Size() int { + return m.Size() +} +func (m *MarginInfo) XXX_DiscardUnknown() { + xxx_messageInfo_MarginInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_MarginInfo proto.InternalMessageInfo + +func (m *MarginInfo) GetMarginHold() string { + if m != nil { + return m.MarginHold + } + return "" +} + +func (m *MarginInfo) GetTotalDeposits() string { + if m != nil { + return m.TotalDeposits + } + return "" +} + +type PositionInfo struct { + IsLong bool `protobuf:"varint,1,opt,name=isLong,proto3" json:"isLong,omitempty"` + BankruptcyPrice string `protobuf:"bytes,2,opt,name=bankruptcy_price,json=bankruptcyPrice,proto3" json:"bankruptcy_price,omitempty"` + Quantity string `protobuf:"bytes,3,opt,name=quantity,proto3" json:"quantity,omitempty"` + PositionHoldQuantity string `protobuf:"bytes,4,opt,name=positionHoldQuantity,proto3" json:"positionHoldQuantity,omitempty"` +} + +func (m *PositionInfo) Reset() { *m = PositionInfo{} } +func (m *PositionInfo) String() string { return proto.CompactTextString(m) } +func (*PositionInfo) ProtoMessage() {} +func (*PositionInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_cf94b0bf3cc7fbf1, []int{6} +} +func (m *PositionInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PositionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PositionInfo.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 *PositionInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_PositionInfo.Merge(m, src) +} +func (m *PositionInfo) XXX_Size() int { + return m.Size() +} +func (m *PositionInfo) XXX_DiscardUnknown() { + xxx_messageInfo_PositionInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_PositionInfo proto.InternalMessageInfo + +func (m *PositionInfo) GetIsLong() bool { + if m != nil { + return m.IsLong + } + return false +} + +func (m *PositionInfo) GetBankruptcyPrice() string { + if m != nil { + return m.BankruptcyPrice + } + return "" +} + +func (m *PositionInfo) GetQuantity() string { + if m != nil { + return m.Quantity + } + return "" +} + +func (m *PositionInfo) GetPositionHoldQuantity() string { + if m != nil { + return m.PositionHoldQuantity + } + return "" +} + // An order quote with fillable data type OrderQuote struct { Order *BaseOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order,omitempty"` @@ -538,7 +763,7 @@ func (m *OrderQuote) Reset() { *m = OrderQuote{} } func (m *OrderQuote) String() string { return proto.CompactTextString(m) } func (*OrderQuote) ProtoMessage() {} func (*OrderQuote) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{4} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{7} } func (m *OrderQuote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -593,7 +818,7 @@ func (m *PriceLevel) Reset() { *m = PriceLevel{} } func (m *PriceLevel) String() string { return proto.CompactTextString(m) } func (*PriceLevel) ProtoMessage() {} func (*PriceLevel) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{5} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{8} } func (m *PriceLevel) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -636,107 +861,6 @@ func (m *PriceLevel) GetQ() string { return "" } -// A valid signed 0x Signed Transaction -type SignedTransaction struct { - // Arbitrary number to facilitate uniqueness of the transactions's hash. - Salt string `protobuf:"bytes,1,opt,name=salt,proto3" json:"salt,omitempty"` - // Address of transaction signer - SignerAddress string `protobuf:"bytes,2,opt,name=signer_address,json=signerAddress,proto3" json:"signer_address,omitempty"` - // The calldata that is to be executed. This must call an Exchange contract - // method. - Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` - // Timestamp in seconds at which transaction expires. - ExpirationTimeSeconds string `protobuf:"bytes,4,opt,name=expiration_time_seconds,json=expirationTimeSeconds,proto3" json:"expiration_time_seconds,omitempty"` - // gasPrice that transaction is required to be executed with. - GasPrice string `protobuf:"bytes,5,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"` - // Exchange Domain specific values. - Domain *ExchangeDomain `protobuf:"bytes,6,opt,name=domain,proto3" json:"domain,omitempty"` - // Signature of the 0x Transaction - Signature string `protobuf:"bytes,7,opt,name=signature,proto3" json:"signature,omitempty"` -} - -func (m *SignedTransaction) Reset() { *m = SignedTransaction{} } -func (m *SignedTransaction) String() string { return proto.CompactTextString(m) } -func (*SignedTransaction) ProtoMessage() {} -func (*SignedTransaction) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{6} -} -func (m *SignedTransaction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *SignedTransaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_SignedTransaction.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 *SignedTransaction) XXX_Merge(src proto.Message) { - xxx_messageInfo_SignedTransaction.Merge(m, src) -} -func (m *SignedTransaction) XXX_Size() int { - return m.Size() -} -func (m *SignedTransaction) XXX_DiscardUnknown() { - xxx_messageInfo_SignedTransaction.DiscardUnknown(m) -} - -var xxx_messageInfo_SignedTransaction proto.InternalMessageInfo - -func (m *SignedTransaction) GetSalt() string { - if m != nil { - return m.Salt - } - return "" -} - -func (m *SignedTransaction) GetSignerAddress() string { - if m != nil { - return m.SignerAddress - } - return "" -} - -func (m *SignedTransaction) GetData() string { - if m != nil { - return m.Data - } - return "" -} - -func (m *SignedTransaction) GetExpirationTimeSeconds() string { - if m != nil { - return m.ExpirationTimeSeconds - } - return "" -} - -func (m *SignedTransaction) GetGasPrice() string { - if m != nil { - return m.GasPrice - } - return "" -} - -func (m *SignedTransaction) GetDomain() *ExchangeDomain { - if m != nil { - return m.Domain - } - return nil -} - -func (m *SignedTransaction) GetSignature() string { - if m != nil { - return m.Signature - } - return "" -} - // A 0x Transaction Exchange Domain type ExchangeDomain struct { // Address of the Injective Coordinator Contract. @@ -749,7 +873,7 @@ func (m *ExchangeDomain) Reset() { *m = ExchangeDomain{} } func (m *ExchangeDomain) String() string { return proto.CompactTextString(m) } func (*ExchangeDomain) ProtoMessage() {} func (*ExchangeDomain) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{7} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{9} } func (m *ExchangeDomain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -792,31 +916,24 @@ func (m *ExchangeDomain) GetChainId() string { return "" } -// A 0x Coordinator Transaction Fill Signatures -type FillSignatures struct { - // EIP712 hash of order (see LibOrder.getTypedDataHash) - OrderHash string `protobuf:"bytes,1,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` - // Array of signatures that correspond to the required signatures to execute - // each order in the transaction - ApprovalSignatures []string `protobuf:"bytes,2,rep,name=approval_signatures,json=approvalSignatures,proto3" json:"approval_signatures,omitempty"` - // Timestamp in seconds at which approval expires - ExpirationTimeSeconds string `protobuf:"bytes,3,opt,name=expiration_time_seconds,json=expirationTimeSeconds,proto3" json:"expiration_time_seconds,omitempty"` - // Desired amount of takerAsset to sell - TakerAssetFillAmount string `protobuf:"bytes,4,opt,name=taker_asset_fill_amount,json=takerAssetFillAmount,proto3" json:"taker_asset_fill_amount,omitempty"` +// A 0x Transaction Exchange Domain +type MsgCreateSpotOrder struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` + Order *BaseOrder `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` } -func (m *FillSignatures) Reset() { *m = FillSignatures{} } -func (m *FillSignatures) String() string { return proto.CompactTextString(m) } -func (*FillSignatures) ProtoMessage() {} -func (*FillSignatures) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{8} +func (m *MsgCreateSpotOrder) Reset() { *m = MsgCreateSpotOrder{} } +func (m *MsgCreateSpotOrder) String() string { return proto.CompactTextString(m) } +func (*MsgCreateSpotOrder) ProtoMessage() {} +func (*MsgCreateSpotOrder) Descriptor() ([]byte, []int) { + return fileDescriptor_cf94b0bf3cc7fbf1, []int{10} } -func (m *FillSignatures) XXX_Unmarshal(b []byte) error { +func (m *MsgCreateSpotOrder) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *FillSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgCreateSpotOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_FillSignatures.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgCreateSpotOrder.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -826,152 +943,32 @@ func (m *FillSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } -func (m *FillSignatures) XXX_Merge(src proto.Message) { - xxx_messageInfo_FillSignatures.Merge(m, src) +func (m *MsgCreateSpotOrder) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCreateSpotOrder.Merge(m, src) } -func (m *FillSignatures) XXX_Size() int { +func (m *MsgCreateSpotOrder) XXX_Size() int { return m.Size() } -func (m *FillSignatures) XXX_DiscardUnknown() { - xxx_messageInfo_FillSignatures.DiscardUnknown(m) +func (m *MsgCreateSpotOrder) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCreateSpotOrder.DiscardUnknown(m) } -var xxx_messageInfo_FillSignatures proto.InternalMessageInfo +var xxx_messageInfo_MsgCreateSpotOrder proto.InternalMessageInfo -func (m *FillSignatures) GetOrderHash() string { - if m != nil { - return m.OrderHash - } - return "" +// A Cosmos-SDK MsgCreateDerivativeOrder +type MsgCreateDerivativeOrder struct { + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` + Order *BaseOrder `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` } -func (m *FillSignatures) GetApprovalSignatures() []string { - if m != nil { - return m.ApprovalSignatures - } - return nil +func (m *MsgCreateDerivativeOrder) Reset() { *m = MsgCreateDerivativeOrder{} } +func (m *MsgCreateDerivativeOrder) String() string { return proto.CompactTextString(m) } +func (*MsgCreateDerivativeOrder) ProtoMessage() {} +func (*MsgCreateDerivativeOrder) Descriptor() ([]byte, []int) { + return fileDescriptor_cf94b0bf3cc7fbf1, []int{11} } - -func (m *FillSignatures) GetExpirationTimeSeconds() string { - if m != nil { - return m.ExpirationTimeSeconds - } - return "" -} - -func (m *FillSignatures) GetTakerAssetFillAmount() string { - if m != nil { - return m.TakerAssetFillAmount - } - return "" -} - -// A 0x Transaction Exchange Domain -type ZeroExTransaction struct { - ZeroExTransactionType int64 `protobuf:"zigzag64,1,opt,name=zero_ex_transaction_type,json=zeroExTransactionType,proto3" json:"zero_ex_transaction_type,omitempty"` - Orders []string `protobuf:"bytes,2,rep,name=orders,proto3" json:"orders,omitempty"` -} - -func (m *ZeroExTransaction) Reset() { *m = ZeroExTransaction{} } -func (m *ZeroExTransaction) String() string { return proto.CompactTextString(m) } -func (*ZeroExTransaction) ProtoMessage() {} -func (*ZeroExTransaction) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{9} -} -func (m *ZeroExTransaction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ZeroExTransaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ZeroExTransaction.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 *ZeroExTransaction) XXX_Merge(src proto.Message) { - xxx_messageInfo_ZeroExTransaction.Merge(m, src) -} -func (m *ZeroExTransaction) XXX_Size() int { - return m.Size() -} -func (m *ZeroExTransaction) XXX_DiscardUnknown() { - xxx_messageInfo_ZeroExTransaction.DiscardUnknown(m) -} - -var xxx_messageInfo_ZeroExTransaction proto.InternalMessageInfo - -func (m *ZeroExTransaction) GetZeroExTransactionType() int64 { - if m != nil { - return m.ZeroExTransactionType - } - return 0 -} - -func (m *ZeroExTransaction) GetOrders() []string { - if m != nil { - return m.Orders - } - return nil -} - -// A 0x Transaction Exchange Domain -type MsgCreateSpotOrder struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` - Order *BaseOrder `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` -} - -func (m *MsgCreateSpotOrder) Reset() { *m = MsgCreateSpotOrder{} } -func (m *MsgCreateSpotOrder) String() string { return proto.CompactTextString(m) } -func (*MsgCreateSpotOrder) ProtoMessage() {} -func (*MsgCreateSpotOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{10} -} -func (m *MsgCreateSpotOrder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgCreateSpotOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgCreateSpotOrder.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 *MsgCreateSpotOrder) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateSpotOrder.Merge(m, src) -} -func (m *MsgCreateSpotOrder) XXX_Size() int { - return m.Size() -} -func (m *MsgCreateSpotOrder) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateSpotOrder.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgCreateSpotOrder proto.InternalMessageInfo - -// A Cosmos-SDK MsgCreateDerivativeOrder -type MsgCreateDerivativeOrder struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` - Order *BaseOrder `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` -} - -func (m *MsgCreateDerivativeOrder) Reset() { *m = MsgCreateDerivativeOrder{} } -func (m *MsgCreateDerivativeOrder) String() string { return proto.CompactTextString(m) } -func (*MsgCreateDerivativeOrder) ProtoMessage() {} -func (*MsgCreateDerivativeOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{11} -} -func (m *MsgCreateDerivativeOrder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) +func (m *MsgCreateDerivativeOrder) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } func (m *MsgCreateDerivativeOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { @@ -997,88 +994,6 @@ func (m *MsgCreateDerivativeOrder) XXX_DiscardUnknown() { var xxx_messageInfo_MsgCreateDerivativeOrder proto.InternalMessageInfo -// A Cosmos-SDK MsgRequestFillSpotOrder -type MsgRequestFillSpotOrder struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` - SignedTransaction *SignedTransaction `protobuf:"bytes,2,opt,name=signed_transaction,json=signedTransaction,proto3" json:"signed_transaction,omitempty"` - TxOrigin string `protobuf:"bytes,3,opt,name=tx_origin,json=txOrigin,proto3" json:"tx_origin,omitempty"` - ApprovalSignature string `protobuf:"bytes,4,opt,name=approval_signature,json=approvalSignature,proto3" json:"approval_signature,omitempty"` -} - -func (m *MsgRequestFillSpotOrder) Reset() { *m = MsgRequestFillSpotOrder{} } -func (m *MsgRequestFillSpotOrder) String() string { return proto.CompactTextString(m) } -func (*MsgRequestFillSpotOrder) ProtoMessage() {} -func (*MsgRequestFillSpotOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{12} -} -func (m *MsgRequestFillSpotOrder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgRequestFillSpotOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgRequestFillSpotOrder.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 *MsgRequestFillSpotOrder) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRequestFillSpotOrder.Merge(m, src) -} -func (m *MsgRequestFillSpotOrder) XXX_Size() int { - return m.Size() -} -func (m *MsgRequestFillSpotOrder) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRequestFillSpotOrder.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgRequestFillSpotOrder proto.InternalMessageInfo - -// A Cosmos-SDK MsgRequestSoftCancelSpotOrder -type MsgRequestSoftCancelSpotOrder struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` - SignedTransaction *SignedTransaction `protobuf:"bytes,2,opt,name=signed_transaction,json=signedTransaction,proto3" json:"signed_transaction,omitempty"` - TxOrigin string `protobuf:"bytes,3,opt,name=tx_origin,json=txOrigin,proto3" json:"tx_origin,omitempty"` - ApprovalSignature string `protobuf:"bytes,4,opt,name=approval_signature,json=approvalSignature,proto3" json:"approval_signature,omitempty"` -} - -func (m *MsgRequestSoftCancelSpotOrder) Reset() { *m = MsgRequestSoftCancelSpotOrder{} } -func (m *MsgRequestSoftCancelSpotOrder) String() string { return proto.CompactTextString(m) } -func (*MsgRequestSoftCancelSpotOrder) ProtoMessage() {} -func (*MsgRequestSoftCancelSpotOrder) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{13} -} -func (m *MsgRequestSoftCancelSpotOrder) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgRequestSoftCancelSpotOrder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgRequestSoftCancelSpotOrder.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 *MsgRequestSoftCancelSpotOrder) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRequestSoftCancelSpotOrder.Merge(m, src) -} -func (m *MsgRequestSoftCancelSpotOrder) XXX_Size() int { - return m.Size() -} -func (m *MsgRequestSoftCancelSpotOrder) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRequestSoftCancelSpotOrder.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgRequestSoftCancelSpotOrder proto.InternalMessageInfo - // A Cosmos-SDK MsgRegisterSpotMarket type MsgRegisterSpotMarket struct { Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` @@ -1092,7 +1007,7 @@ func (m *MsgRegisterSpotMarket) Reset() { *m = MsgRegisterSpotMarket{} } func (m *MsgRegisterSpotMarket) String() string { return proto.CompactTextString(m) } func (*MsgRegisterSpotMarket) ProtoMessage() {} func (*MsgRegisterSpotMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{14} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{12} } func (m *MsgRegisterSpotMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1133,7 +1048,7 @@ func (m *MsgSuspendSpotMarket) Reset() { *m = MsgSuspendSpotMarket{} } func (m *MsgSuspendSpotMarket) String() string { return proto.CompactTextString(m) } func (*MsgSuspendSpotMarket) ProtoMessage() {} func (*MsgSuspendSpotMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{15} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{13} } func (m *MsgSuspendSpotMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1174,7 +1089,7 @@ func (m *MsgResumeSpotMarket) Reset() { *m = MsgResumeSpotMarket{} } func (m *MsgResumeSpotMarket) String() string { return proto.CompactTextString(m) } func (*MsgResumeSpotMarket) ProtoMessage() {} func (*MsgResumeSpotMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{16} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{14} } func (m *MsgResumeSpotMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1213,7 +1128,7 @@ func (m *MsgRegisterDerivativeMarket) Reset() { *m = MsgRegisterDerivati func (m *MsgRegisterDerivativeMarket) String() string { return proto.CompactTextString(m) } func (*MsgRegisterDerivativeMarket) ProtoMessage() {} func (*MsgRegisterDerivativeMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{17} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{15} } func (m *MsgRegisterDerivativeMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1255,7 +1170,7 @@ func (m *MsgSuspendDerivativeMarket) Reset() { *m = MsgSuspendDerivative func (m *MsgSuspendDerivativeMarket) String() string { return proto.CompactTextString(m) } func (*MsgSuspendDerivativeMarket) ProtoMessage() {} func (*MsgSuspendDerivativeMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{18} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{16} } func (m *MsgSuspendDerivativeMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1297,7 +1212,7 @@ func (m *MsgResumeDerivativeMarket) Reset() { *m = MsgResumeDerivativeMa func (m *MsgResumeDerivativeMarket) String() string { return proto.CompactTextString(m) } func (*MsgResumeDerivativeMarket) ProtoMessage() {} func (*MsgResumeDerivativeMarket) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{19} + return fileDescriptor_cf94b0bf3cc7fbf1, []int{17} } func (m *MsgResumeDerivativeMarket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1326,75 +1241,25 @@ func (m *MsgResumeDerivativeMarket) XXX_DiscardUnknown() { var xxx_messageInfo_MsgResumeDerivativeMarket proto.InternalMessageInfo -// A Cosmos-SDK MsgExecuteTakerTransaction -type MsgExecuteTakerTransaction struct { - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` - Quantity string `protobuf:"bytes,2,opt,name=quantity,proto3" json:"quantity,omitempty"` - Margin string `protobuf:"bytes,3,opt,name=margin,proto3" json:"margin,omitempty"` - SubaccountID string `protobuf:"bytes,4,opt,name=subaccount_i_d,json=subaccountID,proto3" json:"subaccount_i_d,omitempty"` - IsLong bool `protobuf:"varint,5,opt,name=isLong,proto3" json:"isLong,omitempty"` - MarketId string `protobuf:"bytes,6,opt,name=market_id,json=marketId,proto3" json:"market_id,omitempty"` - // exchange address - ExchangeAddress string `protobuf:"bytes,7,opt,name=exchange_address,json=exchangeAddress,proto3" json:"exchange_address,omitempty"` - // taker signature = ec.sign(keccack256(abi.encodePacked(quantity, margin, subaccountID, marketID, isLong))) - TakerSignature string `protobuf:"bytes,8,opt,name=taker_signature,json=takerSignature,proto3" json:"taker_signature,omitempty"` -} - -func (m *MsgExecuteTakerTransaction) Reset() { *m = MsgExecuteTakerTransaction{} } -func (m *MsgExecuteTakerTransaction) String() string { return proto.CompactTextString(m) } -func (*MsgExecuteTakerTransaction) ProtoMessage() {} -func (*MsgExecuteTakerTransaction) Descriptor() ([]byte, []int) { - return fileDescriptor_cf94b0bf3cc7fbf1, []int{20} -} -func (m *MsgExecuteTakerTransaction) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgExecuteTakerTransaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgExecuteTakerTransaction.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 *MsgExecuteTakerTransaction) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgExecuteTakerTransaction.Merge(m, src) -} -func (m *MsgExecuteTakerTransaction) XXX_Size() int { - return m.Size() -} -func (m *MsgExecuteTakerTransaction) XXX_DiscardUnknown() { - xxx_messageInfo_MsgExecuteTakerTransaction.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgExecuteTakerTransaction proto.InternalMessageInfo - func init() { + proto.RegisterType((*Params)(nil), "injective.orders.v1beta1.Params") proto.RegisterType((*DerivativeMarket)(nil), "injective.orders.v1beta1.DerivativeMarket") proto.RegisterType((*TradePair)(nil), "injective.orders.v1beta1.TradePair") proto.RegisterType((*BaseOrder)(nil), "injective.orders.v1beta1.BaseOrder") proto.RegisterType((*Order)(nil), "injective.orders.v1beta1.Order") + proto.RegisterType((*MarginInfo)(nil), "injective.orders.v1beta1.MarginInfo") + proto.RegisterType((*PositionInfo)(nil), "injective.orders.v1beta1.PositionInfo") proto.RegisterType((*OrderQuote)(nil), "injective.orders.v1beta1.OrderQuote") proto.RegisterType((*PriceLevel)(nil), "injective.orders.v1beta1.PriceLevel") - proto.RegisterType((*SignedTransaction)(nil), "injective.orders.v1beta1.SignedTransaction") proto.RegisterType((*ExchangeDomain)(nil), "injective.orders.v1beta1.ExchangeDomain") - proto.RegisterType((*FillSignatures)(nil), "injective.orders.v1beta1.FillSignatures") - proto.RegisterType((*ZeroExTransaction)(nil), "injective.orders.v1beta1.ZeroExTransaction") proto.RegisterType((*MsgCreateSpotOrder)(nil), "injective.orders.v1beta1.MsgCreateSpotOrder") proto.RegisterType((*MsgCreateDerivativeOrder)(nil), "injective.orders.v1beta1.MsgCreateDerivativeOrder") - proto.RegisterType((*MsgRequestFillSpotOrder)(nil), "injective.orders.v1beta1.MsgRequestFillSpotOrder") - proto.RegisterType((*MsgRequestSoftCancelSpotOrder)(nil), "injective.orders.v1beta1.MsgRequestSoftCancelSpotOrder") proto.RegisterType((*MsgRegisterSpotMarket)(nil), "injective.orders.v1beta1.MsgRegisterSpotMarket") proto.RegisterType((*MsgSuspendSpotMarket)(nil), "injective.orders.v1beta1.MsgSuspendSpotMarket") proto.RegisterType((*MsgResumeSpotMarket)(nil), "injective.orders.v1beta1.MsgResumeSpotMarket") proto.RegisterType((*MsgRegisterDerivativeMarket)(nil), "injective.orders.v1beta1.MsgRegisterDerivativeMarket") proto.RegisterType((*MsgSuspendDerivativeMarket)(nil), "injective.orders.v1beta1.MsgSuspendDerivativeMarket") proto.RegisterType((*MsgResumeDerivativeMarket)(nil), "injective.orders.v1beta1.MsgResumeDerivativeMarket") - proto.RegisterType((*MsgExecuteTakerTransaction)(nil), "injective.orders.v1beta1.MsgExecuteTakerTransaction") } func init() { @@ -1402,98 +1267,126 @@ func init() { } var fileDescriptor_cf94b0bf3cc7fbf1 = []byte{ - // 1444 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4b, 0x6f, 0x1b, 0xd5, - 0x17, 0xcf, 0x38, 0x8e, 0x63, 0x9f, 0xbc, 0x6f, 0x93, 0x76, 0xda, 0xfe, 0x9b, 0xf6, 0xef, 0x50, - 0x1a, 0x1e, 0x8d, 0x69, 0x11, 0xcf, 0x15, 0x6d, 0xd2, 0x8a, 0x48, 0x89, 0x5a, 0x9c, 0xac, 0xb2, - 0x19, 0xdd, 0xcc, 0x1c, 0x4f, 0x2e, 0xb5, 0xef, 0x38, 0xf7, 0x5e, 0x47, 0x4e, 0x37, 0x08, 0x24, - 0x24, 0x76, 0xb0, 0x63, 0x01, 0x48, 0xb0, 0x67, 0xcf, 0x57, 0x60, 0x47, 0x97, 0xec, 0x40, 0xad, - 0xf8, 0x1e, 0xe8, 0x3e, 0xc6, 0x33, 0x76, 0xec, 0x34, 0x08, 0x21, 0x2a, 0x76, 0x73, 0x5e, 0x33, - 0xe7, 0xf1, 0x3b, 0xe7, 0x9e, 0x3b, 0x70, 0x9d, 0xf1, 0x8f, 0x31, 0x54, 0xec, 0x08, 0x6b, 0x89, - 0x88, 0x50, 0xc8, 0xda, 0xd1, 0xad, 0x7d, 0x54, 0xf4, 0x96, 0x23, 0xd7, 0xda, 0x22, 0x51, 0x09, - 0xf1, 0x7b, 0x6a, 0x6b, 0x8e, 0xef, 0xd4, 0x2e, 0x2d, 0xc6, 0x49, 0x9c, 0x18, 0xa5, 0x9a, 0x7e, - 0xb2, 0xfa, 0xd5, 0x2f, 0xc7, 0x61, 0x7e, 0x03, 0x05, 0x3b, 0xa2, 0xda, 0x66, 0x9b, 0x8a, 0x47, - 0xa8, 0xc8, 0x79, 0x28, 0x29, 0x16, 0x3e, 0x42, 0xe1, 0x7b, 0xd7, 0xbc, 0xd5, 0x4a, 0xdd, 0x51, - 0x9a, 0x9f, 0x08, 0x1a, 0x36, 0xd1, 0x2f, 0x58, 0xbe, 0xa5, 0xc8, 0x0a, 0xcc, 0xec, 0x53, 0x89, - 0x41, 0xd8, 0x11, 0x02, 0x79, 0x78, 0xec, 0x8f, 0x1b, 0xf1, 0xb4, 0x66, 0xae, 0x3b, 0x1e, 0x59, - 0x84, 0x09, 0x9e, 0xf0, 0x10, 0xfd, 0xa2, 0x11, 0x5a, 0x82, 0x5c, 0x86, 0x4a, 0xcb, 0x7c, 0x34, - 0x60, 0x91, 0x3f, 0x61, 0x24, 0x65, 0xcb, 0xd8, 0x8c, 0x88, 0x0f, 0x93, 0xc8, 0xe9, 0x7e, 0x13, - 0x23, 0xbf, 0x74, 0xcd, 0x5b, 0x2d, 0xd7, 0x53, 0x92, 0xbc, 0x02, 0xf3, 0xd8, 0x0d, 0x0f, 0x28, - 0x8f, 0x31, 0xa0, 0x51, 0x24, 0x50, 0x4a, 0x7f, 0xd2, 0x58, 0xcf, 0xa5, 0xfc, 0x3b, 0x96, 0x4d, - 0xfe, 0x0f, 0xd3, 0x6d, 0xc1, 0x42, 0x0c, 0x1a, 0x34, 0x54, 0x89, 0xf0, 0xcb, 0x46, 0x6d, 0xca, - 0xf0, 0xee, 0x1b, 0x16, 0xb9, 0x0a, 0x53, 0x8c, 0x47, 0xd8, 0x0d, 0x0c, 0xd3, 0xaf, 0x18, 0x0d, - 0x30, 0xac, 0x87, 0x9a, 0x43, 0xde, 0x80, 0x45, 0xc6, 0x99, 0x62, 0xb4, 0x19, 0xb4, 0xa8, 0x88, - 0x19, 0x0f, 0x04, 0x55, 0x2c, 0xf1, 0xc1, 0x68, 0x12, 0x27, 0xdb, 0x36, 0xa2, 0xba, 0x96, 0x90, - 0x77, 0xc1, 0x6f, 0x51, 0xc6, 0x15, 0x72, 0xca, 0x43, 0xec, 0xb7, 0x9a, 0x32, 0x56, 0xe7, 0x73, - 0xf2, 0x9c, 0x65, 0xf5, 0x07, 0x0f, 0x2a, 0xbb, 0x82, 0x46, 0xf8, 0x90, 0x32, 0x41, 0x08, 0x14, - 0x39, 0x6d, 0xa1, 0x2b, 0x84, 0x79, 0x26, 0xab, 0x30, 0xdf, 0xa2, 0x8f, 0x50, 0x04, 0x54, 0x4a, - 0x54, 0x41, 0x44, 0x15, 0x75, 0x05, 0x99, 0x35, 0xfc, 0x3b, 0x9a, 0xbd, 0x41, 0x15, 0xd5, 0x9a, - 0x6a, 0x50, 0xd3, 0xd6, 0x66, 0x56, 0xf5, 0x6b, 0x12, 0x28, 0x1e, 0x50, 0x79, 0xe0, 0x8a, 0x63, - 0x9e, 0xf3, 0xe9, 0x9f, 0xe8, 0x4b, 0x7f, 0xf5, 0xc7, 0x09, 0xa8, 0xdc, 0xa5, 0x12, 0x1f, 0x68, - 0x88, 0x91, 0x8b, 0x50, 0x0e, 0x0f, 0x28, 0xe3, 0xba, 0x84, 0xda, 0x4f, 0x52, 0x9f, 0x34, 0xf4, - 0xe6, 0xf0, 0x3a, 0x15, 0x86, 0xd7, 0x69, 0x05, 0x66, 0x5c, 0x54, 0x4e, 0xcf, 0x81, 0xc8, 0x86, - 0x94, 0x29, 0xa9, 0x3e, 0x25, 0xeb, 0xef, 0xb4, 0xca, 0x2b, 0xdd, 0x86, 0xa5, 0x06, 0x62, 0x20, - 0x30, 0x64, 0x6d, 0x86, 0x5c, 0xf5, 0x94, 0x2d, 0xbe, 0xce, 0x35, 0x10, 0xeb, 0xa9, 0x2c, 0xb5, - 0xb9, 0x0e, 0xb3, 0x12, 0x79, 0x94, 0x7b, 0x73, 0xc9, 0x28, 0xcf, 0x58, 0x6e, 0xaa, 0xf6, 0x3a, - 0x90, 0x7c, 0xea, 0x69, 0x2b, 0xe9, 0x70, 0xe5, 0x90, 0x37, 0x9f, 0x25, 0xff, 0x8e, 0xe1, 0x6b, - 0x6d, 0x75, 0x52, 0xdb, 0x02, 0x70, 0x5e, 0x0d, 0x6a, 0x9b, 0x56, 0xd0, 0xda, 0x0d, 0x4c, 0x31, - 0x58, 0x36, 0x8c, 0xfb, 0x68, 0xfa, 0x44, 0xf5, 0x84, 0x16, 0x76, 0x65, 0x95, 0x0a, 0xdf, 0x86, - 0x0b, 0xd8, 0x6d, 0x33, 0x83, 0x2e, 0x1e, 0x28, 0xd6, 0xc2, 0x40, 0x62, 0x98, 0xf0, 0x48, 0x3a, - 0xac, 0x2d, 0x65, 0xe2, 0x5d, 0xd6, 0xc2, 0x1d, 0x2b, 0xd4, 0x45, 0x97, 0xb4, 0xa9, 0xfc, 0x69, - 0x5b, 0x74, 0xfd, 0x3c, 0x14, 0x5c, 0x33, 0x67, 0x06, 0xd7, 0xec, 0x50, 0x70, 0xd5, 0x60, 0xb1, - 0x17, 0x59, 0x5e, 0x7b, 0xce, 0x68, 0x2f, 0xa4, 0x41, 0xf6, 0x19, 0xa8, 0x61, 0x06, 0xf3, 0xd6, - 0x40, 0x9d, 0x30, 0xf8, 0x1f, 0x54, 0x24, 0x8b, 0x39, 0x55, 0x1d, 0x81, 0xfe, 0x82, 0xd1, 0xca, - 0x18, 0xd5, 0xcf, 0x0b, 0x30, 0x61, 0xa1, 0xfa, 0x1e, 0x4c, 0x98, 0xb1, 0x68, 0x70, 0x3a, 0x75, - 0x7b, 0x65, 0x6d, 0xd4, 0xb8, 0x5c, 0xeb, 0xc1, 0xbb, 0x6e, 0x2d, 0xc8, 0xcb, 0x30, 0xa7, 0x74, - 0x5b, 0x06, 0x6d, 0xca, 0x44, 0x60, 0x9a, 0xc5, 0x22, 0x79, 0x46, 0xa5, 0xdd, 0xfa, 0xa1, 0xee, - 0x9a, 0x15, 0x98, 0x69, 0xb0, 0x66, 0x13, 0xa3, 0xb4, 0xde, 0x0e, 0xc7, 0x96, 0xe9, 0x6a, 0x7d, - 0x1e, 0x4a, 0x52, 0x51, 0xd5, 0xb1, 0x00, 0x26, 0x75, 0x47, 0xe9, 0x4a, 0xe6, 0x26, 0x51, 0x20, - 0xf0, 0xb0, 0xc3, 0x04, 0xb6, 0x90, 0x2b, 0x07, 0xde, 0xa5, 0x6c, 0x2a, 0xd5, 0x33, 0x21, 0x79, - 0x09, 0x66, 0x65, 0x67, 0x9f, 0x86, 0xa1, 0x7e, 0x7b, 0xc0, 0x82, 0xc8, 0xc1, 0x77, 0x3a, 0xe3, - 0x6e, 0x6e, 0x54, 0xdb, 0x00, 0x26, 0xa4, 0x8f, 0x3a, 0x89, 0xc2, 0xbf, 0x93, 0x8b, 0x1b, 0x30, - 0xa7, 0xc3, 0xd1, 0xc3, 0x20, 0x8d, 0xd2, 0x0d, 0xa0, 0x94, 0x6d, 0xe3, 0xac, 0xae, 0x02, 0x18, - 0x5f, 0xb7, 0xf0, 0x08, 0x9b, 0x64, 0x1a, 0xbc, 0xb6, 0x9b, 0x64, 0x5e, 0x5b, 0x53, 0x87, 0xce, - 0xcc, 0x3b, 0xac, 0x7e, 0x5d, 0x80, 0x85, 0x1d, 0x16, 0x73, 0x8c, 0x76, 0x05, 0xe5, 0x92, 0x86, - 0x1a, 0xac, 0x3d, 0x84, 0x7a, 0x39, 0x84, 0xea, 0x56, 0xd5, 0x8a, 0x62, 0x60, 0xa2, 0xcc, 0x58, - 0x6e, 0xda, 0xaa, 0x04, 0x8a, 0xb9, 0x79, 0x67, 0x9e, 0x4f, 0x6b, 0x94, 0xe2, 0x69, 0x8d, 0x72, - 0x19, 0x2a, 0x31, 0x95, 0xee, 0x78, 0x70, 0xa7, 0x54, 0x4c, 0xa5, 0x3d, 0x1c, 0x3e, 0x80, 0x52, - 0x94, 0xe8, 0x61, 0x6e, 0x72, 0x3e, 0x75, 0x7b, 0x75, 0x74, 0x22, 0xef, 0xb9, 0x99, 0xb7, 0x61, - 0xf4, 0xeb, 0xce, 0xae, 0x1f, 0xbd, 0x93, 0x83, 0xe8, 0xdd, 0x83, 0xd9, 0x7e, 0x3b, 0x72, 0x13, - 0xc8, 0x11, 0x0a, 0xd6, 0x38, 0x66, 0x3c, 0x0e, 0xc2, 0x84, 0x2b, 0x41, 0xc3, 0x34, 0x47, 0x0b, - 0x3d, 0xc9, 0xba, 0x13, 0xf4, 0xcd, 0x67, 0x9b, 0xaa, 0x74, 0x3e, 0x57, 0x7f, 0xf1, 0x60, 0xf6, - 0x3e, 0x6b, 0x36, 0x77, 0xd2, 0xaf, 0x49, 0x72, 0x05, 0xc0, 0x78, 0x6d, 0x21, 0x6e, 0x5f, 0x5a, - 0x31, 0x1c, 0x03, 0xef, 0x1a, 0x9c, 0xa3, 0xed, 0xb6, 0x48, 0x8e, 0x68, 0x33, 0xe8, 0xf9, 0xa8, - 0x4b, 0x30, 0xae, 0x4f, 0xc2, 0x54, 0x94, 0x7b, 0xdf, 0x29, 0x39, 0x1f, 0x3f, 0x2d, 0xe7, 0x6f, - 0xc1, 0x85, 0xfc, 0x78, 0xd1, 0xc0, 0x4a, 0xb1, 0x66, 0x6b, 0xb5, 0x98, 0x4d, 0x19, 0x1d, 0x82, - 0x43, 0x5c, 0x04, 0x0b, 0x7b, 0x28, 0x92, 0x7b, 0xdd, 0x3c, 0x8c, 0xde, 0x01, 0xff, 0x31, 0x8a, - 0x24, 0xc0, 0x6e, 0xa0, 0x32, 0x76, 0xa0, 0x8e, 0xdb, 0xe8, 0x4e, 0xac, 0xa5, 0xc7, 0x83, 0x46, - 0xbb, 0xc7, 0x6d, 0xb4, 0x1b, 0x8f, 0x2e, 0xa1, 0x0b, 0xd0, 0x51, 0xd5, 0x16, 0x90, 0x6d, 0x19, - 0xaf, 0x0b, 0xa4, 0x0a, 0x77, 0xda, 0x89, 0xb2, 0xd3, 0x45, 0x77, 0xb5, 0x39, 0x2e, 0xd2, 0xbd, - 0xc9, 0x52, 0x59, 0xa7, 0x15, 0xfe, 0x6a, 0xa7, 0xbd, 0x5f, 0xfc, 0xe2, 0xfb, 0xab, 0x63, 0x55, - 0x09, 0x7e, 0xef, 0x73, 0xd9, 0xb6, 0xf6, 0x0f, 0x7f, 0xf4, 0x37, 0x0f, 0x2e, 0x6c, 0xcb, 0x58, - 0x8f, 0x19, 0x94, 0x26, 0xc5, 0xcf, 0x8f, 0x74, 0x0f, 0x88, 0xe9, 0xc2, 0x28, 0x9f, 0x67, 0xe7, - 0xc1, 0x6b, 0xa3, 0x3d, 0x38, 0xd1, 0xf8, 0xf5, 0x05, 0x79, 0x62, 0x16, 0xe8, 0x23, 0xb0, 0x1b, - 0x24, 0x82, 0xc5, 0x8c, 0x3b, 0xe8, 0x94, 0x55, 0xf7, 0x81, 0xa1, 0x75, 0x4b, 0x9c, 0x84, 0xa5, - 0x03, 0xca, 0xc2, 0x09, 0x54, 0xba, 0x08, 0xff, 0xf0, 0xe0, 0x4a, 0x16, 0xe1, 0x4e, 0xd2, 0x50, - 0xeb, 0x7a, 0x1b, 0xfb, 0xcf, 0xc5, 0xf9, 0x93, 0x07, 0x4b, 0x26, 0xce, 0x98, 0x49, 0x85, 0x42, - 0x87, 0x97, 0x6d, 0xfa, 0x43, 0xe3, 0x4b, 0xd7, 0xce, 0xc2, 0x73, 0xd6, 0xce, 0xf1, 0x33, 0x6f, - 0x06, 0xc5, 0xa1, 0x9b, 0xc1, 0xc8, 0x15, 0xd3, 0x79, 0xfe, 0xad, 0x07, 0x8b, 0xdb, 0x32, 0xde, - 0xe9, 0xc8, 0x36, 0xf2, 0xe8, 0xc5, 0x71, 0xdc, 0xb9, 0xf7, 0x8d, 0x07, 0xe7, 0x4c, 0x62, 0x65, - 0xa7, 0x85, 0x2f, 0x9c, 0x77, 0x9f, 0xc0, 0xe5, 0x5c, 0xd5, 0x87, 0xdd, 0xf2, 0x86, 0x3a, 0x79, - 0x17, 0x4a, 0xf6, 0x06, 0xe6, 0xf0, 0xfc, 0xea, 0x68, 0x3c, 0x0f, 0xbe, 0xb3, 0xee, 0x2c, 0x9d, - 0x03, 0x9f, 0x79, 0x70, 0x29, 0xab, 0xde, 0x99, 0x1d, 0xe8, 0xbb, 0x13, 0x16, 0x06, 0xee, 0x84, - 0xc3, 0x6e, 0x14, 0xe3, 0x43, 0x6f, 0x14, 0xce, 0x89, 0x4f, 0x3d, 0xb8, 0xd8, 0xab, 0xd1, 0xbf, - 0xe4, 0xc3, 0x77, 0x05, 0x93, 0x88, 0x7b, 0x5d, 0x0c, 0x3b, 0x0a, 0x77, 0x75, 0xb1, 0xf2, 0x1d, - 0x3f, 0xca, 0x89, 0x4b, 0x50, 0x3e, 0xec, 0x50, 0xae, 0x98, 0x3a, 0x4e, 0x7d, 0x48, 0x69, 0x6d, - 0x63, 0x2f, 0x95, 0xee, 0xcb, 0x8e, 0x1a, 0xb2, 0x09, 0x16, 0x4f, 0x6e, 0x82, 0xda, 0x9a, 0xc9, - 0xad, 0x84, 0xc7, 0xae, 0xed, 0x1c, 0xd5, 0x1f, 0x76, 0xe9, 0x0c, 0x61, 0x8f, 0xb8, 0x74, 0xdf, - 0x80, 0x39, 0x0b, 0xd5, 0x6c, 0x46, 0x95, 0x73, 0x48, 0x1d, 0x18, 0x50, 0x77, 0x1b, 0x3f, 0x3f, - 0x5d, 0xf6, 0x9e, 0x3c, 0x5d, 0xf6, 0x7e, 0x7f, 0xba, 0xec, 0x7d, 0xf5, 0x6c, 0x79, 0xec, 0xc9, - 0xb3, 0xe5, 0xb1, 0x5f, 0x9f, 0x2d, 0x8f, 0xed, 0x6d, 0xc5, 0x4c, 0x1d, 0x74, 0xf6, 0xd7, 0xc2, - 0xa4, 0x55, 0xdb, 0x4c, 0x61, 0xb8, 0x45, 0xf7, 0x65, 0xad, 0x07, 0xca, 0x9b, 0x61, 0x22, 0x30, - 0x4f, 0xea, 0xdd, 0xa6, 0xd6, 0x4a, 0xa2, 0x4e, 0x13, 0x65, 0xfa, 0xb3, 0x44, 0x1f, 0xf5, 0x72, - 0xbf, 0x64, 0x7e, 0x7a, 0xbc, 0xf9, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xf3, 0xf7, 0x01, - 0x4d, 0x11, 0x00, 0x00, + // 1382 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x1c, 0xc5, + 0x12, 0xf7, 0xd8, 0xeb, 0xcd, 0x6e, 0xd9, 0x5e, 0xdb, 0x1d, 0xdb, 0x6f, 0x92, 0xbc, 0xe7, 0xf8, + 0xad, 0x93, 0xf7, 0x0c, 0x4a, 0x6c, 0x12, 0x10, 0x82, 0xdc, 0xe2, 0x38, 0x51, 0x2c, 0xd9, 0xc2, + 0xd9, 0xf8, 0x14, 0x09, 0x8d, 0x7a, 0x67, 0x6a, 0xc7, 0x8d, 0x67, 0x7a, 0xc6, 0xdd, 0x3d, 0x96, + 0xf7, 0x84, 0xe0, 0xc4, 0x91, 0x23, 0x12, 0x1c, 0xe0, 0xce, 0x9d, 0xaf, 0x00, 0xb7, 0x1c, 0x39, + 0x21, 0x14, 0x7f, 0x03, 0x3e, 0x01, 0xea, 0x3f, 0xb3, 0xb3, 0xeb, 0x6c, 0x44, 0x10, 0x42, 0xe4, + 0x36, 0xfd, 0xab, 0x5f, 0x75, 0x57, 0x77, 0xff, 0xaa, 0xaa, 0x07, 0x6e, 0x32, 0xfe, 0x09, 0x86, + 0x8a, 0x9d, 0xe2, 0x56, 0x26, 0x22, 0x14, 0x72, 0xeb, 0xf4, 0x4e, 0x17, 0x15, 0xbd, 0xe3, 0x86, + 0x9b, 0xb9, 0xc8, 0x54, 0x46, 0xfc, 0x01, 0x6d, 0xd3, 0xe1, 0x8e, 0x76, 0x75, 0x29, 0xce, 0xe2, + 0xcc, 0x90, 0xb6, 0xf4, 0x97, 0xe5, 0xb7, 0x3f, 0x86, 0xfa, 0x01, 0x15, 0x34, 0x95, 0x64, 0x1f, + 0xe6, 0x7b, 0x85, 0x2a, 0x04, 0xca, 0x00, 0x39, 0xed, 0x26, 0x18, 0xf9, 0xde, 0xda, 0xd4, 0x46, + 0x73, 0xfb, 0xc6, 0x6f, 0xbf, 0x5c, 0x5f, 0xeb, 0xd3, 0x34, 0xb9, 0xd7, 0xbe, 0x40, 0xb8, 0x95, + 0xa5, 0x4c, 0x61, 0x9a, 0xab, 0x7e, 0xbb, 0xd3, 0x72, 0xb6, 0x87, 0xd6, 0x74, 0xaf, 0xf6, 0xd5, + 0xb7, 0xd7, 0x27, 0xda, 0xe7, 0x35, 0x58, 0xd8, 0x41, 0xc1, 0x4e, 0xa9, 0x0e, 0x69, 0x9f, 0x8a, + 0x63, 0x54, 0x64, 0x05, 0xea, 0x8a, 0x85, 0xc7, 0x28, 0x7c, 0x6f, 0xcd, 0xdb, 0x68, 0x76, 0xdc, + 0x48, 0xe3, 0x99, 0xa0, 0x61, 0x82, 0xfe, 0xa4, 0xc5, 0xed, 0x88, 0xac, 0xc3, 0x5c, 0x97, 0x4a, + 0x0c, 0xc2, 0x42, 0x08, 0xe4, 0x61, 0xdf, 0x9f, 0x32, 0xe6, 0x59, 0x0d, 0x3e, 0x70, 0x18, 0x59, + 0x82, 0x69, 0x9e, 0xf1, 0x10, 0xfd, 0x9a, 0x31, 0xda, 0x01, 0xb9, 0x06, 0xcd, 0xd4, 0x2c, 0x1a, + 0xb0, 0xc8, 0x9f, 0x36, 0x96, 0x86, 0x05, 0x76, 0x23, 0xe2, 0xc3, 0xa5, 0x72, 0xa7, 0xf5, 0x35, + 0x6f, 0xa3, 0xd1, 0x29, 0x87, 0xe4, 0x2d, 0x58, 0xc0, 0xb3, 0xf0, 0x88, 0xf2, 0x18, 0x03, 0x1a, + 0x45, 0x02, 0xa5, 0xf4, 0x2f, 0x19, 0xef, 0xf9, 0x12, 0xbf, 0x6f, 0x61, 0xf2, 0x5f, 0x98, 0xcd, + 0x05, 0x0b, 0x31, 0xe8, 0xd1, 0x50, 0x65, 0xc2, 0x6f, 0x18, 0xda, 0x8c, 0xc1, 0x1e, 0x19, 0x88, + 0x5c, 0x87, 0x19, 0xc6, 0x23, 0x3c, 0x0b, 0x0c, 0xe8, 0x37, 0x0d, 0x03, 0x0c, 0x74, 0xa0, 0x11, + 0xf2, 0x0e, 0x2c, 0x31, 0xce, 0x14, 0xa3, 0x49, 0x90, 0x52, 0x11, 0x33, 0x1e, 0x08, 0xaa, 0x58, + 0xe6, 0x83, 0x61, 0x12, 0x67, 0xdb, 0x37, 0xa6, 0x8e, 0xb6, 0x90, 0x0f, 0xc0, 0x4f, 0x29, 0xe3, + 0x0a, 0x39, 0xe5, 0x21, 0x8e, 0x7a, 0xcd, 0x18, 0xaf, 0x95, 0x21, 0xfb, 0xb0, 0xe7, 0x1a, 0xcc, + 0xa6, 0xf4, 0x18, 0x45, 0xa0, 0xce, 0x82, 0x1e, 0xa2, 0x3f, 0x6b, 0xa3, 0x31, 0xd8, 0xe1, 0xd9, + 0x23, 0x44, 0xcd, 0x50, 0xc3, 0x8c, 0x39, 0xcb, 0x50, 0x15, 0xe3, 0x3d, 0x58, 0xe1, 0x78, 0xa6, + 0x82, 0x5e, 0xc1, 0x23, 0xc6, 0xe3, 0x40, 0xb1, 0x14, 0xa5, 0xa2, 0x69, 0xee, 0xb7, 0x0c, 0x77, + 0x49, 0x5b, 0x1f, 0x59, 0xe3, 0x61, 0x69, 0xd3, 0x87, 0x5a, 0x3a, 0xe8, 0xc8, 0xc4, 0x29, 0x4d, + 0xfc, 0x79, 0x7b, 0xa8, 0x0e, 0xdf, 0x75, 0x30, 0xb9, 0x0d, 0x24, 0x2c, 0xd2, 0x22, 0x31, 0xaa, + 0x29, 0x97, 0xf1, 0x17, 0x0c, 0x79, 0xb1, 0xb2, 0xb8, 0x25, 0xda, 0xdf, 0x79, 0xd0, 0x3c, 0x14, + 0x34, 0xc2, 0x03, 0xca, 0x04, 0x21, 0x50, 0xe3, 0x34, 0x45, 0x27, 0x2e, 0xf3, 0x4d, 0x36, 0x60, + 0xc1, 0xee, 0x9a, 0x4a, 0x89, 0x2a, 0x88, 0xa8, 0xa2, 0x4e, 0x64, 0x2d, 0x83, 0xdf, 0xd7, 0xf0, + 0x0e, 0x55, 0x54, 0x33, 0xd5, 0x45, 0xa6, 0xd5, 0x5b, 0x4b, 0x8d, 0x32, 0x09, 0xd4, 0x8e, 0xa8, + 0x3c, 0x72, 0x82, 0x33, 0xdf, 0xc3, 0x92, 0x9a, 0x1e, 0x91, 0x54, 0xfb, 0xfb, 0x69, 0x68, 0x6e, + 0x53, 0x89, 0x1f, 0xe9, 0xac, 0x24, 0x57, 0xa0, 0x11, 0x1e, 0x51, 0xc6, 0xb5, 0x2c, 0x75, 0x9c, + 0xa4, 0x73, 0xc9, 0x8c, 0x77, 0xc7, 0x6b, 0x6f, 0x72, 0xbc, 0xf6, 0xd6, 0x61, 0xce, 0xed, 0xca, + 0xf1, 0x5c, 0x62, 0xd8, 0x2d, 0x55, 0x24, 0x35, 0x42, 0xb2, 0xf1, 0xda, 0x3b, 0x2e, 0x49, 0x77, + 0x61, 0xb9, 0x87, 0x18, 0x08, 0x0c, 0x59, 0xce, 0x90, 0xab, 0x01, 0xd9, 0xe6, 0xcc, 0xe5, 0x1e, + 0x62, 0xa7, 0xb4, 0x95, 0x3e, 0x37, 0xa1, 0x25, 0x91, 0x47, 0x43, 0x33, 0xd7, 0x0d, 0x79, 0xce, + 0xa2, 0x25, 0xed, 0x16, 0x90, 0xe1, 0xa3, 0xa7, 0x69, 0x56, 0x70, 0xe5, 0xb2, 0x69, 0xa1, 0x3a, + 0xfc, 0xfb, 0x06, 0xd7, 0x6c, 0xf5, 0x32, 0xdb, 0x26, 0xd5, 0x82, 0xba, 0xc8, 0x36, 0xe9, 0xad, + 0xd9, 0x5a, 0xa7, 0xcd, 0x32, 0xbd, 0x8f, 0x51, 0x68, 0x95, 0x5e, 0x83, 0xa6, 0x1a, 0x18, 0x6d, + 0x2a, 0x35, 0x54, 0x69, 0x7c, 0x1f, 0xfe, 0x85, 0x67, 0x39, 0x33, 0x19, 0xc3, 0x8d, 0x80, 0x03, + 0x89, 0x61, 0xc6, 0x23, 0xe9, 0xf2, 0x67, 0xb9, 0x32, 0x6b, 0x09, 0x3f, 0xb5, 0x46, 0x7d, 0xe9, + 0x92, 0x26, 0xca, 0xa5, 0x8d, 0xf9, 0x1e, 0x2b, 0xae, 0xb9, 0xd7, 0x16, 0x57, 0x6b, 0xac, 0xb8, + 0xb6, 0x60, 0x69, 0xb0, 0xb3, 0x61, 0xb6, 0x4d, 0x98, 0xc5, 0x72, 0x93, 0x23, 0x0e, 0x6a, 0x9c, + 0x83, 0x4b, 0x1a, 0xf5, 0x92, 0xc3, 0xbf, 0xa1, 0x29, 0x59, 0xcc, 0xa9, 0xae, 0xda, 0xfe, 0xa2, + 0x61, 0x55, 0x40, 0xfb, 0xa7, 0x49, 0x98, 0xb6, 0x52, 0xfd, 0x10, 0xa6, 0x4d, 0x27, 0x31, 0x3a, + 0x9d, 0xb9, 0xbb, 0xbe, 0xf9, 0xaa, 0x0e, 0xb3, 0x39, 0x90, 0x77, 0xc7, 0x7a, 0x90, 0xff, 0xc1, + 0xbc, 0xd2, 0x69, 0x19, 0xe4, 0x94, 0x89, 0xc0, 0x24, 0x8b, 0x55, 0xf2, 0x9c, 0x2a, 0xb3, 0xf5, + 0xb1, 0xce, 0x9a, 0x75, 0x98, 0xeb, 0xb1, 0x24, 0xc1, 0xa8, 0xbc, 0x6f, 0xa7, 0x63, 0x0b, 0xba, + 0xbb, 0x5e, 0x81, 0xba, 0x54, 0x54, 0x15, 0x56, 0xc0, 0xa4, 0xe3, 0x46, 0xfa, 0x26, 0x87, 0xaa, + 0x6b, 0x20, 0xf0, 0xa4, 0x60, 0x02, 0x53, 0xe4, 0xca, 0x89, 0x77, 0xb9, 0xaa, 0xb4, 0x9d, 0xca, + 0x48, 0x6e, 0x40, 0x4b, 0x16, 0x5d, 0x1a, 0x86, 0x7a, 0xf6, 0x80, 0x05, 0x91, 0x93, 0xef, 0x6c, + 0x85, 0xee, 0xee, 0x90, 0xff, 0x00, 0x98, 0xbd, 0x04, 0xaa, 0x9f, 0xa3, 0x51, 0x6d, 0xad, 0xd3, + 0x34, 0xc8, 0x61, 0x3f, 0x37, 0xad, 0x49, 0x09, 0x16, 0xc7, 0x28, 0x5c, 0x71, 0x6f, 0xb8, 0xe4, + 0xb2, 0xa0, 0x59, 0xb4, 0x7d, 0x08, 0x60, 0x2b, 0xf0, 0x2e, 0xef, 0x65, 0xba, 0x1b, 0xb8, 0x72, + 0x7d, 0x94, 0x25, 0x91, 0xab, 0x52, 0x60, 0xa1, 0xc7, 0x59, 0x12, 0xe9, 0xbc, 0x52, 0x99, 0xa2, + 0x49, 0x10, 0x61, 0x9e, 0x49, 0xa6, 0xe4, 0xe0, 0xd0, 0x34, 0xba, 0xe3, 0x40, 0x5d, 0xf4, 0x66, + 0x0f, 0xf4, 0x27, 0xcb, 0xec, 0xc4, 0x2b, 0x50, 0x67, 0x72, 0x2f, 0xe3, 0xb1, 0x99, 0xb3, 0xd1, + 0x71, 0x23, 0x5d, 0x50, 0xba, 0x94, 0x1f, 0x8b, 0x22, 0x57, 0x61, 0xdf, 0x85, 0xe9, 0x0a, 0x4a, + 0x85, 0xdb, 0x46, 0x74, 0x15, 0x1a, 0x27, 0x05, 0xe5, 0x8a, 0xa9, 0xb2, 0xc9, 0x0e, 0xc6, 0xe4, + 0x2e, 0x2c, 0xe5, 0x6e, 0x39, 0x1d, 0xe6, 0x93, 0x92, 0x67, 0xcb, 0xc9, 0x58, 0x5b, 0x3b, 0x07, + 0x30, 0x82, 0x78, 0x52, 0x64, 0x0a, 0xff, 0x8a, 0x92, 0xfe, 0x0f, 0xf3, 0x5a, 0x0c, 0xba, 0x94, + 0x96, 0x1a, 0x71, 0xe5, 0xbb, 0x84, 0xad, 0x4a, 0xda, 0x1b, 0x00, 0x66, 0x2b, 0x7b, 0x78, 0x8a, + 0x09, 0x99, 0x05, 0x2f, 0x77, 0x27, 0xec, 0xe5, 0x7a, 0x74, 0xe2, 0xdc, 0xbc, 0x93, 0xf6, 0x33, + 0x68, 0x3d, 0x74, 0xf5, 0x74, 0x27, 0xd3, 0xcd, 0x52, 0x77, 0x9d, 0x53, 0x14, 0xac, 0xd7, 0xd7, + 0x2d, 0x2a, 0xcc, 0xb8, 0x12, 0x34, 0x54, 0xce, 0x7d, 0x71, 0x60, 0x79, 0xe0, 0x0c, 0x23, 0x35, + 0xdc, 0xce, 0x5a, 0xd6, 0xf0, 0x76, 0x0a, 0x64, 0x5f, 0xc6, 0x0f, 0x04, 0x52, 0x85, 0x4f, 0xf3, + 0x4c, 0xd9, 0x4c, 0xd2, 0x0a, 0x36, 0xa5, 0xb1, 0x7c, 0xf7, 0xd8, 0x51, 0x75, 0x2e, 0x93, 0x7f, + 0xf6, 0x5c, 0xee, 0xd5, 0xbe, 0xd0, 0xaf, 0x2c, 0x09, 0xfe, 0x60, 0xb9, 0xea, 0xb5, 0xf5, 0x37, + 0x2f, 0xfa, 0x83, 0x07, 0xcb, 0xfb, 0x32, 0xee, 0x60, 0xcc, 0xa4, 0x42, 0xa1, 0xb7, 0x59, 0xbd, + 0xef, 0xc6, 0x2e, 0x59, 0x36, 0xe6, 0xc9, 0x3f, 0x68, 0xcc, 0x53, 0xaf, 0x5d, 0x3b, 0x6b, 0x63, + 0x6b, 0xe7, 0x2b, 0x9b, 0xb0, 0x8b, 0xfc, 0x1b, 0x0f, 0x96, 0xf6, 0x65, 0xfc, 0xb4, 0x90, 0x39, + 0xf2, 0xe8, 0xcd, 0x09, 0xdc, 0x85, 0xf7, 0xb5, 0x07, 0x97, 0xcd, 0xc1, 0xca, 0x22, 0xc5, 0x37, + 0x2e, 0xba, 0x4f, 0xe1, 0xda, 0xd0, 0xad, 0x8f, 0x7b, 0xdb, 0x8f, 0x0d, 0x72, 0x1b, 0xea, 0xf6, + 0xdd, 0xed, 0xf4, 0xf6, 0xf6, 0xab, 0xf5, 0x76, 0x71, 0xce, 0x8e, 0xf3, 0x74, 0x01, 0x7c, 0xee, + 0xc1, 0xd5, 0xea, 0xf6, 0x5e, 0x3b, 0x80, 0x91, 0x3f, 0x81, 0xc9, 0x0b, 0x7f, 0x02, 0xe3, 0xde, + 0x5c, 0x53, 0x63, 0xdf, 0x5c, 0x2e, 0x88, 0xcf, 0x3c, 0xb8, 0x32, 0xb8, 0xa3, 0x7f, 0x26, 0x86, + 0xed, 0xde, 0x8f, 0x2f, 0x56, 0xbd, 0xe7, 0x2f, 0x56, 0xbd, 0x5f, 0x5f, 0xac, 0x7a, 0x5f, 0x9e, + 0xaf, 0x4e, 0x3c, 0x3f, 0x5f, 0x9d, 0xf8, 0xf9, 0x7c, 0x75, 0xe2, 0xd9, 0x5e, 0xcc, 0xd4, 0x51, + 0xd1, 0xdd, 0x0c, 0xb3, 0x74, 0x6b, 0xb7, 0x3c, 0xe6, 0x3d, 0xda, 0x95, 0x5b, 0x83, 0x43, 0xbf, + 0x1d, 0x66, 0x02, 0x87, 0x87, 0xba, 0x72, 0x6d, 0xa5, 0x59, 0x54, 0x24, 0x28, 0xcb, 0x3f, 0x4c, + 0xdd, 0xf3, 0x64, 0xb7, 0x6e, 0xfe, 0x14, 0xdf, 0xfd, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x93, 0x22, + 0xfd, 0x17, 0x82, 0x0e, 0x00, 0x00, +} + +func (m *Params) 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 *Params) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.FuturesEnabled) > 0 { + for iNdEx := len(m.FuturesEnabled) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.FuturesEnabled[iNdEx]) + copy(dAtA[i:], m.FuturesEnabled[iNdEx]) + i = encodeVarintOrders(dAtA, i, uint64(len(m.FuturesEnabled[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil } func (m *DerivativeMarket) Marshal() (dAtA []byte, err error) { @@ -1516,6 +1409,43 @@ func (m *DerivativeMarket) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.CumulativeFunding) > 0 { + i -= len(m.CumulativeFunding) + copy(dAtA[i:], m.CumulativeFunding) + i = encodeVarintOrders(dAtA, i, uint64(len(m.CumulativeFunding))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.FundingInterval) > 0 { + i -= len(m.FundingInterval) + copy(dAtA[i:], m.FundingInterval) + i = encodeVarintOrders(dAtA, i, uint64(len(m.FundingInterval))) + i-- + dAtA[i] = 0x7a + } + if len(m.NextFundingTimestamp) > 0 { + i -= len(m.NextFundingTimestamp) + copy(dAtA[i:], m.NextFundingTimestamp) + i = encodeVarintOrders(dAtA, i, uint64(len(m.NextFundingTimestamp))) + i-- + dAtA[i] = 0x72 + } + if len(m.TakerTxFee) > 0 { + i -= len(m.TakerTxFee) + copy(dAtA[i:], m.TakerTxFee) + i = encodeVarintOrders(dAtA, i, uint64(len(m.TakerTxFee))) + i-- + dAtA[i] = 0x6a + } + if len(m.MakerTxFee) > 0 { + i -= len(m.MakerTxFee) + copy(dAtA[i:], m.MakerTxFee) + i = encodeVarintOrders(dAtA, i, uint64(len(m.MakerTxFee))) + i-- + dAtA[i] = 0x62 + } if len(m.MaintenanceMarginRatio) > 0 { i -= len(m.MaintenanceMarginRatio) copy(dAtA[i:], m.MaintenanceMarginRatio) @@ -1824,6 +1754,18 @@ func (m *Order) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.TriggerPrice) > 0 { + i -= len(m.TriggerPrice) + copy(dAtA[i:], m.TriggerPrice) + i = encodeVarintOrders(dAtA, i, uint64(len(m.TriggerPrice))) + i-- + dAtA[i] = 0x42 + } + if m.OrderType != 0 { + i = encodeVarintOrders(dAtA, i, uint64(m.OrderType)) + i-- + dAtA[i] = 0x38 + } if len(m.SubaccountID) > 0 { i -= len(m.SubaccountID) copy(dAtA[i:], m.SubaccountID) @@ -1872,7 +1814,7 @@ func (m *Order) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *OrderQuote) Marshal() (dAtA []byte, err error) { +func (m *MarginInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1882,39 +1824,34 @@ func (m *OrderQuote) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *OrderQuote) MarshalTo(dAtA []byte) (int, error) { +func (m *MarginInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *OrderQuote) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MarginInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.FillableAmount) > 0 { - i -= len(m.FillableAmount) - copy(dAtA[i:], m.FillableAmount) - i = encodeVarintOrders(dAtA, i, uint64(len(m.FillableAmount))) + if len(m.TotalDeposits) > 0 { + i -= len(m.TotalDeposits) + copy(dAtA[i:], m.TotalDeposits) + i = encodeVarintOrders(dAtA, i, uint64(len(m.TotalDeposits))) i-- dAtA[i] = 0x12 } - if m.Order != nil { - { - size, err := m.Order.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOrders(dAtA, i, uint64(size)) - } + if len(m.MarginHold) > 0 { + i -= len(m.MarginHold) + copy(dAtA[i:], m.MarginHold) + i = encodeVarintOrders(dAtA, i, uint64(len(m.MarginHold))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *PriceLevel) Marshal() (dAtA []byte, err error) { +func (m *PositionInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1924,111 +1861,51 @@ func (m *PriceLevel) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *PriceLevel) MarshalTo(dAtA []byte) (int, error) { +func (m *PositionInfo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *PriceLevel) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PositionInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Q) > 0 { - i -= len(m.Q) - copy(dAtA[i:], m.Q) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Q))) + if len(m.PositionHoldQuantity) > 0 { + i -= len(m.PositionHoldQuantity) + copy(dAtA[i:], m.PositionHoldQuantity) + i = encodeVarintOrders(dAtA, i, uint64(len(m.PositionHoldQuantity))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x22 } - if len(m.P) > 0 { - i -= len(m.P) - copy(dAtA[i:], m.P) - i = encodeVarintOrders(dAtA, i, uint64(len(m.P))) + if len(m.Quantity) > 0 { + i -= len(m.Quantity) + copy(dAtA[i:], m.Quantity) + i = encodeVarintOrders(dAtA, i, uint64(len(m.Quantity))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x1a } - return len(dAtA) - i, nil -} - -func (m *SignedTransaction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err + if len(m.BankruptcyPrice) > 0 { + i -= len(m.BankruptcyPrice) + copy(dAtA[i:], m.BankruptcyPrice) + i = encodeVarintOrders(dAtA, i, uint64(len(m.BankruptcyPrice))) + i-- + dAtA[i] = 0x12 } - return dAtA[:n], nil -} - -func (m *SignedTransaction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *SignedTransaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Signature) > 0 { - i -= len(m.Signature) - copy(dAtA[i:], m.Signature) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Signature))) + if m.IsLong { i-- - dAtA[i] = 0x3a - } - if m.Domain != nil { - { - size, err := m.Domain.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOrders(dAtA, i, uint64(size)) + if m.IsLong { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } i-- - dAtA[i] = 0x32 - } - if len(m.GasPrice) > 0 { - i -= len(m.GasPrice) - copy(dAtA[i:], m.GasPrice) - i = encodeVarintOrders(dAtA, i, uint64(len(m.GasPrice))) - i-- - dAtA[i] = 0x2a - } - if len(m.ExpirationTimeSeconds) > 0 { - i -= len(m.ExpirationTimeSeconds) - copy(dAtA[i:], m.ExpirationTimeSeconds) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ExpirationTimeSeconds))) - i-- - dAtA[i] = 0x22 - } - if len(m.Data) > 0 { - i -= len(m.Data) - copy(dAtA[i:], m.Data) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Data))) - i-- - dAtA[i] = 0x1a - } - if len(m.SignerAddress) > 0 { - i -= len(m.SignerAddress) - copy(dAtA[i:], m.SignerAddress) - i = encodeVarintOrders(dAtA, i, uint64(len(m.SignerAddress))) - i-- - dAtA[i] = 0x12 - } - if len(m.Salt) > 0 { - i -= len(m.Salt) - copy(dAtA[i:], m.Salt) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Salt))) - i-- - dAtA[i] = 0xa + dAtA[i] = 0x8 } return len(dAtA) - i, nil } -func (m *ExchangeDomain) Marshal() (dAtA []byte, err error) { +func (m *OrderQuote) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2038,34 +1915,39 @@ func (m *ExchangeDomain) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ExchangeDomain) MarshalTo(dAtA []byte) (int, error) { +func (m *OrderQuote) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ExchangeDomain) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *OrderQuote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ChainId))) + if len(m.FillableAmount) > 0 { + i -= len(m.FillableAmount) + copy(dAtA[i:], m.FillableAmount) + i = encodeVarintOrders(dAtA, i, uint64(len(m.FillableAmount))) i-- dAtA[i] = 0x12 } - if len(m.VerifyingContract) > 0 { - i -= len(m.VerifyingContract) - copy(dAtA[i:], m.VerifyingContract) - i = encodeVarintOrders(dAtA, i, uint64(len(m.VerifyingContract))) + if m.Order != nil { + { + size, err := m.Order.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOrders(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *FillSignatures) Marshal() (dAtA []byte, err error) { +func (m *PriceLevel) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2075,50 +1957,34 @@ func (m *FillSignatures) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *FillSignatures) MarshalTo(dAtA []byte) (int, error) { +func (m *PriceLevel) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *FillSignatures) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *PriceLevel) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.TakerAssetFillAmount) > 0 { - i -= len(m.TakerAssetFillAmount) - copy(dAtA[i:], m.TakerAssetFillAmount) - i = encodeVarintOrders(dAtA, i, uint64(len(m.TakerAssetFillAmount))) - i-- - dAtA[i] = 0x22 - } - if len(m.ExpirationTimeSeconds) > 0 { - i -= len(m.ExpirationTimeSeconds) - copy(dAtA[i:], m.ExpirationTimeSeconds) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ExpirationTimeSeconds))) + if len(m.Q) > 0 { + i -= len(m.Q) + copy(dAtA[i:], m.Q) + i = encodeVarintOrders(dAtA, i, uint64(len(m.Q))) i-- - dAtA[i] = 0x1a - } - if len(m.ApprovalSignatures) > 0 { - for iNdEx := len(m.ApprovalSignatures) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.ApprovalSignatures[iNdEx]) - copy(dAtA[i:], m.ApprovalSignatures[iNdEx]) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ApprovalSignatures[iNdEx]))) - i-- - dAtA[i] = 0x12 - } + dAtA[i] = 0x12 } - if len(m.OrderHash) > 0 { - i -= len(m.OrderHash) - copy(dAtA[i:], m.OrderHash) - i = encodeVarintOrders(dAtA, i, uint64(len(m.OrderHash))) + if len(m.P) > 0 { + i -= len(m.P) + copy(dAtA[i:], m.P) + i = encodeVarintOrders(dAtA, i, uint64(len(m.P))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *ZeroExTransaction) Marshal() (dAtA []byte, err error) { +func (m *ExchangeDomain) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2128,29 +1994,29 @@ func (m *ZeroExTransaction) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *ZeroExTransaction) MarshalTo(dAtA []byte) (int, error) { +func (m *ExchangeDomain) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *ZeroExTransaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ExchangeDomain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Orders) > 0 { - for iNdEx := len(m.Orders) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Orders[iNdEx]) - copy(dAtA[i:], m.Orders[iNdEx]) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Orders[iNdEx]))) - i-- - dAtA[i] = 0x12 - } + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintOrders(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0x12 } - if m.ZeroExTransactionType != 0 { - i = encodeVarintOrders(dAtA, i, uint64((uint64(m.ZeroExTransactionType)<<1)^uint64((m.ZeroExTransactionType>>63)))) + if len(m.VerifyingContract) > 0 { + i -= len(m.VerifyingContract) + copy(dAtA[i:], m.VerifyingContract) + i = encodeVarintOrders(dAtA, i, uint64(len(m.VerifyingContract))) i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -2239,118 +2105,6 @@ func (m *MsgCreateDerivativeOrder) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *MsgRequestFillSpotOrder) 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 *MsgRequestFillSpotOrder) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgRequestFillSpotOrder) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ApprovalSignature) > 0 { - i -= len(m.ApprovalSignature) - copy(dAtA[i:], m.ApprovalSignature) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ApprovalSignature))) - i-- - dAtA[i] = 0x22 - } - if len(m.TxOrigin) > 0 { - i -= len(m.TxOrigin) - copy(dAtA[i:], m.TxOrigin) - i = encodeVarintOrders(dAtA, i, uint64(len(m.TxOrigin))) - i-- - dAtA[i] = 0x1a - } - if m.SignedTransaction != nil { - { - size, err := m.SignedTransaction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOrders(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgRequestSoftCancelSpotOrder) 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 *MsgRequestSoftCancelSpotOrder) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgRequestSoftCancelSpotOrder) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ApprovalSignature) > 0 { - i -= len(m.ApprovalSignature) - copy(dAtA[i:], m.ApprovalSignature) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ApprovalSignature))) - i-- - dAtA[i] = 0x22 - } - if len(m.TxOrigin) > 0 { - i -= len(m.TxOrigin) - copy(dAtA[i:], m.TxOrigin) - i = encodeVarintOrders(dAtA, i, uint64(len(m.TxOrigin))) - i-- - dAtA[i] = 0x1a - } - if m.SignedTransaction != nil { - { - size, err := m.SignedTransaction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOrders(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *MsgRegisterSpotMarket) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2644,112 +2398,45 @@ func (m *MsgResumeDerivativeMarket) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } -func (m *MsgExecuteTakerTransaction) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err +func encodeVarintOrders(dAtA []byte, offset int, v uint64) int { + offset -= sovOrders(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ } - return dAtA[:n], nil + dAtA[offset] = uint8(v) + return base } - -func (m *MsgExecuteTakerTransaction) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func (m *Params) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.FuturesEnabled) > 0 { + for _, s := range m.FuturesEnabled { + l = len(s) + n += 1 + l + sovOrders(uint64(l)) + } + } + return n } -func (m *MsgExecuteTakerTransaction) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i +func (m *DerivativeMarket) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l - if len(m.TakerSignature) > 0 { - i -= len(m.TakerSignature) - copy(dAtA[i:], m.TakerSignature) - i = encodeVarintOrders(dAtA, i, uint64(len(m.TakerSignature))) - i-- - dAtA[i] = 0x42 + l = len(m.Ticker) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) } - if len(m.ExchangeAddress) > 0 { - i -= len(m.ExchangeAddress) - copy(dAtA[i:], m.ExchangeAddress) - i = encodeVarintOrders(dAtA, i, uint64(len(m.ExchangeAddress))) - i-- - dAtA[i] = 0x3a - } - if len(m.MarketId) > 0 { - i -= len(m.MarketId) - copy(dAtA[i:], m.MarketId) - i = encodeVarintOrders(dAtA, i, uint64(len(m.MarketId))) - i-- - dAtA[i] = 0x32 - } - if m.IsLong { - i-- - if m.IsLong { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x28 - } - if len(m.SubaccountID) > 0 { - i -= len(m.SubaccountID) - copy(dAtA[i:], m.SubaccountID) - i = encodeVarintOrders(dAtA, i, uint64(len(m.SubaccountID))) - i-- - dAtA[i] = 0x22 - } - if len(m.Margin) > 0 { - i -= len(m.Margin) - copy(dAtA[i:], m.Margin) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Margin))) - i-- - dAtA[i] = 0x1a - } - if len(m.Quantity) > 0 { - i -= len(m.Quantity) - copy(dAtA[i:], m.Quantity) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Quantity))) - i-- - dAtA[i] = 0x12 - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintOrders(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintOrders(dAtA []byte, offset int, v uint64) int { - offset -= sovOrders(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *DerivativeMarket) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Ticker) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.Oracle) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) + l = len(m.Oracle) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) } l = len(m.BaseCurrency) if l > 0 { @@ -2786,6 +2473,26 @@ func (m *DerivativeMarket) Size() (n int) { if l > 0 { n += 1 + l + sovOrders(uint64(l)) } + l = len(m.MakerTxFee) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) + } + l = len(m.TakerTxFee) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) + } + l = len(m.NextFundingTimestamp) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) + } + l = len(m.FundingInterval) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) + } + l = len(m.CumulativeFunding) + if l > 0 { + n += 2 + l + sovOrders(uint64(l)) + } return n } @@ -2922,138 +2629,104 @@ func (m *Order) Size() (n int) { if l > 0 { n += 1 + l + sovOrders(uint64(l)) } - return n -} - -func (m *OrderQuote) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Order != nil { - l = m.Order.Size() - n += 1 + l + sovOrders(uint64(l)) + if m.OrderType != 0 { + n += 1 + sovOrders(uint64(m.OrderType)) } - l = len(m.FillableAmount) + l = len(m.TriggerPrice) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } return n } -func (m *PriceLevel) Size() (n int) { +func (m *MarginInfo) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.P) + l = len(m.MarginHold) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } - l = len(m.Q) + l = len(m.TotalDeposits) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } return n } -func (m *SignedTransaction) Size() (n int) { +func (m *PositionInfo) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Salt) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.SignerAddress) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.Data) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) + if m.IsLong { + n += 2 } - l = len(m.ExpirationTimeSeconds) + l = len(m.BankruptcyPrice) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } - l = len(m.GasPrice) + l = len(m.Quantity) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } - if m.Domain != nil { - l = m.Domain.Size() - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.Signature) + l = len(m.PositionHoldQuantity) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } return n } -func (m *ExchangeDomain) Size() (n int) { +func (m *OrderQuote) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.VerifyingContract) - if l > 0 { + if m.Order != nil { + l = m.Order.Size() n += 1 + l + sovOrders(uint64(l)) } - l = len(m.ChainId) + l = len(m.FillableAmount) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } return n } -func (m *FillSignatures) Size() (n int) { +func (m *PriceLevel) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.OrderHash) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - if len(m.ApprovalSignatures) > 0 { - for _, s := range m.ApprovalSignatures { - l = len(s) - n += 1 + l + sovOrders(uint64(l)) - } - } - l = len(m.ExpirationTimeSeconds) + l = len(m.P) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } - l = len(m.TakerAssetFillAmount) + l = len(m.Q) if l > 0 { n += 1 + l + sovOrders(uint64(l)) } return n } -func (m *ZeroExTransaction) Size() (n int) { +func (m *ExchangeDomain) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.ZeroExTransactionType != 0 { - n += 1 + sozOrders(uint64(m.ZeroExTransactionType)) + l = len(m.VerifyingContract) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) } - if len(m.Orders) > 0 { - for _, s := range m.Orders { - l = len(s) - n += 1 + l + sovOrders(uint64(l)) - } + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovOrders(uint64(l)) } return n } @@ -3092,56 +2765,6 @@ func (m *MsgCreateDerivativeOrder) Size() (n int) { return n } -func (m *MsgRequestFillSpotOrder) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - if m.SignedTransaction != nil { - l = m.SignedTransaction.Size() - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.TxOrigin) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.ApprovalSignature) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - return n -} - -func (m *MsgRequestSoftCancelSpotOrder) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - if m.SignedTransaction != nil { - l = m.SignedTransaction.Size() - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.TxOrigin) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.ApprovalSignature) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - return n -} - func (m *MsgRegisterSpotMarket) Size() (n int) { if m == nil { return 0 @@ -3279,53 +2902,13 @@ func (m *MsgResumeDerivativeMarket) Size() (n int) { return n } -func (m *MsgExecuteTakerTransaction) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.Quantity) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.Margin) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.SubaccountID) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - if m.IsLong { - n += 2 - } - l = len(m.MarketId) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.ExchangeAddress) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - l = len(m.TakerSignature) - if l > 0 { - n += 1 + l + sovOrders(uint64(l)) - } - return n -} - func sovOrders(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } func sozOrders(x uint64) (n int) { return sovOrders(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *DerivativeMarket) Unmarshal(dAtA []byte) error { +func (m *Params) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -3348,15 +2931,15 @@ func (m *DerivativeMarket) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: DerivativeMarket: wiretype end group for non-group") + return fmt.Errorf("proto: Params: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: DerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ticker", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FuturesEnabled", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3384,36 +2967,121 @@ func (m *DerivativeMarket) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Ticker = string(dAtA[iNdEx:postIndex]) + m.FuturesEnabled = append(m.FuturesEnabled, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Oracle", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipOrders(dAtA[iNdEx:]) + if err != nil { + return err } - intStringLen := int(stringLen) - if intStringLen < 0 { + if skippy < 0 { return ErrInvalidLengthOrders } - postIndex := iNdEx + intStringLen - if postIndex < 0 { + if (iNdEx + skippy) < 0 { return ErrInvalidLengthOrders } - if postIndex > l { + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *DerivativeMarket) 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 ErrIntOverflowOrders + } + 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: DerivativeMarket: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ticker", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Ticker = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Oracle", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { return io.ErrUnexpectedEOF } m.Oracle = string(dAtA[iNdEx:postIndex]) @@ -3694,6 +3362,166 @@ func (m *DerivativeMarket) Unmarshal(dAtA []byte) error { } m.MaintenanceMarginRatio = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MakerTxFee", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MakerTxFee = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 13: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TakerTxFee", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TakerTxFee = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 14: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NextFundingTimestamp", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NextFundingTimestamp = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FundingInterval", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.FundingInterval = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CumulativeFunding", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CumulativeFunding = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOrders(dAtA[iNdEx:]) @@ -4719,64 +4547,11 @@ func (m *Order) Unmarshal(dAtA []byte) error { } m.SubaccountID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *OrderQuote) 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 ErrIntOverflowOrders - } - 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: OrderQuote: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OrderQuote: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Order", wireType) + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field OrderType", wireType) } - var msglen int + m.OrderType = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOrders @@ -4786,31 +4561,14 @@ func (m *OrderQuote) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.OrderType |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthOrders - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Order == nil { - m.Order = &BaseOrder{} - } - if err := m.Order.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: + case 8: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FillableAmount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TriggerPrice", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4838,7 +4596,7 @@ func (m *OrderQuote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.FillableAmount = string(dAtA[iNdEx:postIndex]) + m.TriggerPrice = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -4864,7 +4622,7 @@ func (m *OrderQuote) Unmarshal(dAtA []byte) error { } return nil } -func (m *PriceLevel) Unmarshal(dAtA []byte) error { +func (m *MarginInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4887,15 +4645,15 @@ func (m *PriceLevel) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: PriceLevel: wiretype end group for non-group") + return fmt.Errorf("proto: MarginInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: PriceLevel: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MarginInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field P", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MarginHold", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4923,11 +4681,11 @@ func (m *PriceLevel) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.P = string(dAtA[iNdEx:postIndex]) + m.MarginHold = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Q", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TotalDeposits", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4955,7 +4713,7 @@ func (m *PriceLevel) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Q = string(dAtA[iNdEx:postIndex]) + m.TotalDeposits = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -4981,7 +4739,7 @@ func (m *PriceLevel) Unmarshal(dAtA []byte) error { } return nil } -func (m *SignedTransaction) Unmarshal(dAtA []byte) error { +func (m *PositionInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5004,17 +4762,17 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SignedTransaction: wiretype end group for non-group") + return fmt.Errorf("proto: PositionInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SignedTransaction: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PositionInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Salt", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IsLong", wireType) } - var stringLen uint64 + var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOrders @@ -5024,27 +4782,15 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Salt = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex + m.IsLong = bool(v != 0) case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SignerAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BankruptcyPrice", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5072,11 +4818,11 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.SignerAddress = string(dAtA[iNdEx:postIndex]) + m.BankruptcyPrice = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Data", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Quantity", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5104,11 +4850,11 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Data = string(dAtA[iNdEx:postIndex]) + m.Quantity = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpirationTimeSeconds", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PositionHoldQuantity", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5136,43 +4882,64 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ExpirationTimeSeconds = string(dAtA[iNdEx:postIndex]) + m.PositionHoldQuantity = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GasPrice", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipOrders(dAtA[iNdEx:]) + if err != nil { + return err } - intStringLen := int(stringLen) - if intStringLen < 0 { + if skippy < 0 { return ErrInvalidLengthOrders } - postIndex := iNdEx + intStringLen - if postIndex < 0 { + if (iNdEx + skippy) < 0 { return ErrInvalidLengthOrders } - if postIndex > l { + if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.GasPrice = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *OrderQuote) 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 ErrIntOverflowOrders + } + 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: OrderQuote: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OrderQuote: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Order", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5199,16 +4966,16 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Domain == nil { - m.Domain = &ExchangeDomain{} + if m.Order == nil { + m.Order = &BaseOrder{} } - if err := m.Domain.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Order.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 7: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Signature", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FillableAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5236,7 +5003,7 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Signature = string(dAtA[iNdEx:postIndex]) + m.FillableAmount = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5262,7 +5029,7 @@ func (m *SignedTransaction) Unmarshal(dAtA []byte) error { } return nil } -func (m *ExchangeDomain) Unmarshal(dAtA []byte) error { +func (m *PriceLevel) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5285,15 +5052,15 @@ func (m *ExchangeDomain) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: ExchangeDomain: wiretype end group for non-group") + return fmt.Errorf("proto: PriceLevel: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: ExchangeDomain: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: PriceLevel: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field VerifyingContract", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field P", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5321,11 +5088,11 @@ func (m *ExchangeDomain) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.VerifyingContract = string(dAtA[iNdEx:postIndex]) + m.P = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Q", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5353,7 +5120,7 @@ func (m *ExchangeDomain) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) + m.Q = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -5379,7 +5146,7 @@ func (m *ExchangeDomain) Unmarshal(dAtA []byte) error { } return nil } -func (m *FillSignatures) Unmarshal(dAtA []byte) error { +func (m *ExchangeDomain) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5402,15 +5169,15 @@ func (m *FillSignatures) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: FillSignatures: wiretype end group for non-group") + return fmt.Errorf("proto: ExchangeDomain: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: FillSignatures: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ExchangeDomain: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field VerifyingContract", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5438,11 +5205,11 @@ func (m *FillSignatures) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.OrderHash = string(dAtA[iNdEx:postIndex]) + m.VerifyingContract = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ApprovalSignatures", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5470,191 +5237,21 @@ func (m *FillSignatures) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ApprovalSignatures = append(m.ApprovalSignatures, string(dAtA[iNdEx:postIndex])) + m.ChainId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpirationTimeSeconds", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipOrders(dAtA[iNdEx:]) + if err != nil { + return err } - intStringLen := int(stringLen) - if intStringLen < 0 { + if skippy < 0 { return ErrInvalidLengthOrders } - postIndex := iNdEx + intStringLen - if postIndex < 0 { + if (iNdEx + skippy) < 0 { return ErrInvalidLengthOrders } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ExpirationTimeSeconds = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetFillAmount", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TakerAssetFillAmount = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ZeroExTransaction) 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 ErrIntOverflowOrders - } - 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: ZeroExTransaction: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ZeroExTransaction: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ZeroExTransactionType", wireType) - } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) - m.ZeroExTransactionType = int64(v) - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Orders", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Orders = append(m.Orders, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { + if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } iNdEx += skippy @@ -5908,7 +5505,7 @@ func (m *MsgCreateDerivativeOrder) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { +func (m *MsgRegisterSpotMarket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5931,10 +5528,10 @@ func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRequestFillSpotOrder: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRegisterSpotMarket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRequestFillSpotOrder: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRegisterSpotMarket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5971,9 +5568,9 @@ func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SignedTransaction", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOrders @@ -5983,31 +5580,27 @@ func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthOrders } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthOrders } if postIndex > l { return io.ErrUnexpectedEOF } - if m.SignedTransaction == nil { - m.SignedTransaction = &SignedTransaction{} - } - if err := m.SignedTransaction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxOrigin", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MakerAssetData", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6035,11 +5628,11 @@ func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TxOrigin = string(dAtA[iNdEx:postIndex]) + m.MakerAssetData = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ApprovalSignature", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetData", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6067,8 +5660,28 @@ func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ApprovalSignature = string(dAtA[iNdEx:postIndex]) + m.TakerAssetData = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Enabled", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Enabled = bool(v != 0) default: iNdEx = preIndex skippy, err := skipOrders(dAtA[iNdEx:]) @@ -6093,7 +5706,7 @@ func (m *MsgRequestFillSpotOrder) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRequestSoftCancelSpotOrder) Unmarshal(dAtA []byte) error { +func (m *MsgSuspendSpotMarket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6116,10 +5729,10 @@ func (m *MsgRequestSoftCancelSpotOrder) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRequestSoftCancelSpotOrder: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSuspendSpotMarket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRequestSoftCancelSpotOrder: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSuspendSpotMarket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6156,75 +5769,7 @@ func (m *MsgRequestSoftCancelSpotOrder) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SignedTransaction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOrders - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.SignedTransaction == nil { - m.SignedTransaction = &SignedTransaction{} - } - if err := m.SignedTransaction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxOrigin", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxOrigin = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ApprovalSignature", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6249,630 +5794,14 @@ func (m *MsgRequestSoftCancelSpotOrder) Unmarshal(dAtA []byte) error { if postIndex < 0 { return ErrInvalidLengthOrders } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ApprovalSignature = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgRegisterSpotMarket) 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 ErrIntOverflowOrders - } - 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: MsgRegisterSpotMarket: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRegisterSpotMarket: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MakerAssetData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MakerAssetData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TakerAssetData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Enabled", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.Enabled = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgSuspendSpotMarket) 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 ErrIntOverflowOrders - } - 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: MsgSuspendSpotMarket: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSuspendSpotMarket: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MakerAssetData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MakerAssetData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TakerAssetData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgResumeSpotMarket) 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 ErrIntOverflowOrders - } - 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: MsgResumeSpotMarket: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgResumeSpotMarket: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MakerAssetData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MakerAssetData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TakerAssetData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOrders(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthOrders - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgRegisterDerivativeMarket) 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 ErrIntOverflowOrders - } - if iNdEx >= l { + if postIndex > 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: MsgRegisterDerivativeMarket: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRegisterDerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MakerAssetData", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6900,13 +5829,13 @@ func (m *MsgRegisterDerivativeMarket) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Sender = string(dAtA[iNdEx:postIndex]) + m.MakerAssetData = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Market", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetData", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOrders @@ -6916,27 +5845,23 @@ func (m *MsgRegisterDerivativeMarket) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthOrders } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthOrders } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Market == nil { - m.Market = &DerivativeMarket{} - } - if err := m.Market.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.TakerAssetData = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -6962,7 +5887,7 @@ func (m *MsgRegisterDerivativeMarket) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { +func (m *MsgResumeSpotMarket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6985,10 +5910,10 @@ func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgSuspendDerivativeMarket: wiretype end group for non-group") + return fmt.Errorf("proto: MsgResumeSpotMarket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSuspendDerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgResumeSpotMarket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7025,7 +5950,7 @@ func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MarketId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7053,11 +5978,11 @@ func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.MarketId = string(dAtA[iNdEx:postIndex]) + m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExchangeAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MakerAssetData", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7085,7 +6010,39 @@ func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ExchangeAddress = string(dAtA[iNdEx:postIndex]) + m.MakerAssetData = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetData", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOrders + } + 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 ErrInvalidLengthOrders + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthOrders + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TakerAssetData = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -7111,7 +6068,7 @@ func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgResumeDerivativeMarket) Unmarshal(dAtA []byte) error { +func (m *MsgRegisterDerivativeMarket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7134,10 +6091,10 @@ func (m *MsgResumeDerivativeMarket) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgResumeDerivativeMarket: wiretype end group for non-group") + return fmt.Errorf("proto: MsgRegisterDerivativeMarket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgResumeDerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgRegisterDerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7174,9 +6131,9 @@ func (m *MsgResumeDerivativeMarket) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MarketId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Market", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowOrders @@ -7186,55 +6143,27 @@ func (m *MsgResumeDerivativeMarket) 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 ErrInvalidLengthOrders } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthOrders } if postIndex > l { return io.ErrUnexpectedEOF } - m.MarketId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExchangeAddress", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - 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 ErrInvalidLengthOrders - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthOrders + if m.Market == nil { + m.Market = &DerivativeMarket{} } - if postIndex > l { - return io.ErrUnexpectedEOF + if err := m.Market.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.ExchangeAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -7260,7 +6189,7 @@ func (m *MsgResumeDerivativeMarket) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { +func (m *MsgSuspendDerivativeMarket) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7283,10 +6212,10 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgExecuteTakerTransaction: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSuspendDerivativeMarket: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgExecuteTakerTransaction: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSuspendDerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7323,7 +6252,7 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Quantity", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MarketId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7351,11 +6280,11 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Quantity = string(dAtA[iNdEx:postIndex]) + m.MarketId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Margin", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ExchangeAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7383,63 +6312,64 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Margin = string(dAtA[iNdEx:postIndex]) + m.ExchangeAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SubaccountID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipOrders(dAtA[iNdEx:]) + if err != nil { + return err } - intStringLen := int(stringLen) - if intStringLen < 0 { + if skippy < 0 { return ErrInvalidLengthOrders } - postIndex := iNdEx + intStringLen - if postIndex < 0 { + if (iNdEx + skippy) < 0 { return ErrInvalidLengthOrders } - if postIndex > l { + if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.SubaccountID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IsLong", wireType) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MsgResumeDerivativeMarket) 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 ErrIntOverflowOrders } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOrders - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } + if iNdEx >= l { + return io.ErrUnexpectedEOF } - m.IsLong = bool(v != 0) - case 6: + 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: MsgResumeDerivativeMarket: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgResumeDerivativeMarket: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MarketId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7467,11 +6397,11 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.MarketId = string(dAtA[iNdEx:postIndex]) + m.Sender = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 7: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExchangeAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MarketId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7499,11 +6429,11 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ExchangeAddress = string(dAtA[iNdEx:postIndex]) + m.MarketId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 8: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TakerSignature", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ExchangeAddress", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7531,7 +6461,7 @@ func (m *MsgExecuteTakerTransaction) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TakerSignature = string(dAtA[iNdEx:postIndex]) + m.ExchangeAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/chain/orders/types/query.pb.go b/chain/orders/types/query.pb.go index 7c2fe2b5..292a781d 100644 --- a/chain/orders/types/query.pb.go +++ b/chain/orders/types/query.pb.go @@ -35,9 +35,11 @@ type QueryDerivativeOrdersQuoteRequest struct { Quantity string `protobuf:"bytes,1,opt,name=quantity,proto3" json:"quantity,omitempty"` // The desired marketID of the derivative orders to fill MarketId string `protobuf:"bytes,2,opt,name=market_id,json=marketId,proto3" json:"market_id,omitempty"` - // True if the desired direction of the derivative orders quotes you want is long. + // True if the desired direction of the derivative orders quotes you want is + // long. IsLong bool `protobuf:"varint,3,opt,name=isLong,proto3" json:"isLong,omitempty"` - // Optional maker address of trader requesting the quote (to filter out the trader's own orders) + // Optional maker address of trader requesting the quote (to filter out the + // trader's own orders) MakerAddress string `protobuf:"bytes,4,opt,name=maker_address,json=makerAddress,proto3" json:"maker_address,omitempty"` } @@ -373,23 +375,30 @@ func (m *QueryDerivativeOrderbookResponse) GetLongs() []*PriceLevel { return nil } -// QueryDerivativeMarketsRequest defines the request type for the -// Query/DerivativeMarkets RPC method -type QueryDerivativeMarketsRequest struct { +// QueryMarginInfoRequest defines the request type for +// Query/marginInfo RPC method. +type QueryMarginInfoRequest struct { + // The maker_address of the trader + MakerAddress string `protobuf:"bytes,1,opt,name=maker_address,json=makerAddress,proto3" json:"maker_address,omitempty"` + // The subaccount nonce of the trader + TakerFee string `protobuf:"bytes,2,opt,name=taker_fee,json=takerFee,proto3" json:"taker_fee,omitempty"` + SubaccountID string `protobuf:"bytes,3,opt,name=subaccount_i_d,json=subaccountID,proto3" json:"subaccount_i_d,omitempty"` + BaseCurrency string `protobuf:"bytes,4,opt,name=base_currency,json=baseCurrency,proto3" json:"base_currency,omitempty"` + ExchangeAddress string `protobuf:"bytes,5,opt,name=exchange_address,json=exchangeAddress,proto3" json:"exchange_address,omitempty"` } -func (m *QueryDerivativeMarketsRequest) Reset() { *m = QueryDerivativeMarketsRequest{} } -func (m *QueryDerivativeMarketsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryDerivativeMarketsRequest) ProtoMessage() {} -func (*QueryDerivativeMarketsRequest) Descriptor() ([]byte, []int) { +func (m *QueryMarginInfoRequest) Reset() { *m = QueryMarginInfoRequest{} } +func (m *QueryMarginInfoRequest) String() string { return proto.CompactTextString(m) } +func (*QueryMarginInfoRequest) ProtoMessage() {} +func (*QueryMarginInfoRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d11505616d5f0a14, []int{6} } -func (m *QueryDerivativeMarketsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryMarginInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryDerivativeMarketsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryMarginInfoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryDerivativeMarketsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryMarginInfoRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -399,37 +408,71 @@ func (m *QueryDerivativeMarketsRequest) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } -func (m *QueryDerivativeMarketsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryDerivativeMarketsRequest.Merge(m, src) +func (m *QueryMarginInfoRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryMarginInfoRequest.Merge(m, src) } -func (m *QueryDerivativeMarketsRequest) XXX_Size() int { +func (m *QueryMarginInfoRequest) XXX_Size() int { return m.Size() } -func (m *QueryDerivativeMarketsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryDerivativeMarketsRequest.DiscardUnknown(m) +func (m *QueryMarginInfoRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryMarginInfoRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryDerivativeMarketsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryMarginInfoRequest proto.InternalMessageInfo -// QueryDerivativeMarketsResponse defines the response type for -// Query/DerivativeMarkets RPC method. -type QueryDerivativeMarketsResponse struct { - // Array of found derivative markets - Markets []*DerivativeMarket `protobuf:"bytes,1,rep,name=markets,proto3" json:"markets,omitempty"` +func (m *QueryMarginInfoRequest) GetMakerAddress() string { + if m != nil { + return m.MakerAddress + } + return "" } -func (m *QueryDerivativeMarketsResponse) Reset() { *m = QueryDerivativeMarketsResponse{} } -func (m *QueryDerivativeMarketsResponse) String() string { return proto.CompactTextString(m) } -func (*QueryDerivativeMarketsResponse) ProtoMessage() {} -func (*QueryDerivativeMarketsResponse) Descriptor() ([]byte, []int) { +func (m *QueryMarginInfoRequest) GetTakerFee() string { + if m != nil { + return m.TakerFee + } + return "" +} + +func (m *QueryMarginInfoRequest) GetSubaccountID() string { + if m != nil { + return m.SubaccountID + } + return "" +} + +func (m *QueryMarginInfoRequest) GetBaseCurrency() string { + if m != nil { + return m.BaseCurrency + } + return "" +} + +func (m *QueryMarginInfoRequest) GetExchangeAddress() string { + if m != nil { + return m.ExchangeAddress + } + return "" +} + +// QueryMarginInfoResponse defines the response type for +// Query/marginInfo RPC method. +type QueryMarginInfoResponse struct { + MarginInfo *MarginInfo `protobuf:"bytes,1,opt,name=margin_info,json=marginInfo,proto3" json:"margin_info,omitempty"` +} + +func (m *QueryMarginInfoResponse) Reset() { *m = QueryMarginInfoResponse{} } +func (m *QueryMarginInfoResponse) String() string { return proto.CompactTextString(m) } +func (*QueryMarginInfoResponse) ProtoMessage() {} +func (*QueryMarginInfoResponse) Descriptor() ([]byte, []int) { return fileDescriptor_d11505616d5f0a14, []int{7} } -func (m *QueryDerivativeMarketsResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryMarginInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryDerivativeMarketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryMarginInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryDerivativeMarketsResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryMarginInfoResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -439,46 +482,42 @@ func (m *QueryDerivativeMarketsResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } -func (m *QueryDerivativeMarketsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryDerivativeMarketsResponse.Merge(m, src) +func (m *QueryMarginInfoResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryMarginInfoResponse.Merge(m, src) } -func (m *QueryDerivativeMarketsResponse) XXX_Size() int { +func (m *QueryMarginInfoResponse) XXX_Size() int { return m.Size() } -func (m *QueryDerivativeMarketsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryDerivativeMarketsResponse.DiscardUnknown(m) +func (m *QueryMarginInfoResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryMarginInfoResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryDerivativeMarketsResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryMarginInfoResponse proto.InternalMessageInfo -func (m *QueryDerivativeMarketsResponse) GetMarkets() []*DerivativeMarket { +func (m *QueryMarginInfoResponse) GetMarginInfo() *MarginInfo { if m != nil { - return m.Markets + return m.MarginInfo } return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QuerySoftCancelledOrdersRequest struct { - // The hashes of orders to be checked whether they can be soft-cancelled - OrderHashes []string `protobuf:"bytes,1,rep,name=order_hashes,json=orderHashes,proto3" json:"order_hashes,omitempty"` - // Ethereum Chain ID of the transaction - ChainId int64 `protobuf:"zigzag64,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` +// QueryDerivativeMarketsRequest defines the request type for the +// Query/DerivativeMarkets RPC method +type QueryDerivativeMarketsRequest struct { } -func (m *QuerySoftCancelledOrdersRequest) Reset() { *m = QuerySoftCancelledOrdersRequest{} } -func (m *QuerySoftCancelledOrdersRequest) String() string { return proto.CompactTextString(m) } -func (*QuerySoftCancelledOrdersRequest) ProtoMessage() {} -func (*QuerySoftCancelledOrdersRequest) Descriptor() ([]byte, []int) { +func (m *QueryDerivativeMarketsRequest) Reset() { *m = QueryDerivativeMarketsRequest{} } +func (m *QueryDerivativeMarketsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryDerivativeMarketsRequest) ProtoMessage() {} +func (*QueryDerivativeMarketsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d11505616d5f0a14, []int{8} } -func (m *QuerySoftCancelledOrdersRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryDerivativeMarketsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QuerySoftCancelledOrdersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryDerivativeMarketsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QuerySoftCancelledOrdersRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryDerivativeMarketsRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -488,51 +527,37 @@ func (m *QuerySoftCancelledOrdersRequest) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } -func (m *QuerySoftCancelledOrdersRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QuerySoftCancelledOrdersRequest.Merge(m, src) +func (m *QueryDerivativeMarketsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDerivativeMarketsRequest.Merge(m, src) } -func (m *QuerySoftCancelledOrdersRequest) XXX_Size() int { +func (m *QueryDerivativeMarketsRequest) XXX_Size() int { return m.Size() } -func (m *QuerySoftCancelledOrdersRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QuerySoftCancelledOrdersRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QuerySoftCancelledOrdersRequest proto.InternalMessageInfo - -func (m *QuerySoftCancelledOrdersRequest) GetOrderHashes() []string { - if m != nil { - return m.OrderHashes - } - return nil +func (m *QueryDerivativeMarketsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryDerivativeMarketsRequest.DiscardUnknown(m) } -func (m *QuerySoftCancelledOrdersRequest) GetChainId() int64 { - if m != nil { - return m.ChainId - } - return 0 -} +var xxx_messageInfo_QueryDerivativeMarketsRequest proto.InternalMessageInfo -// QuerySoftCancelledOrdersResponse defines the response type for -// Query/SoftCancelledOrders RPC method. -type QuerySoftCancelledOrdersResponse struct { - // The subset of orders that have been soft-cancelled - OrderHashes []string `protobuf:"bytes,1,rep,name=order_hashes,json=orderHashes,proto3" json:"order_hashes,omitempty"` +// QueryDerivativeMarketsResponse defines the response type for +// Query/DerivativeMarkets RPC method. +type QueryDerivativeMarketsResponse struct { + // Array of found derivative markets + Markets []*DerivativeMarket `protobuf:"bytes,1,rep,name=markets,proto3" json:"markets,omitempty"` } -func (m *QuerySoftCancelledOrdersResponse) Reset() { *m = QuerySoftCancelledOrdersResponse{} } -func (m *QuerySoftCancelledOrdersResponse) String() string { return proto.CompactTextString(m) } -func (*QuerySoftCancelledOrdersResponse) ProtoMessage() {} -func (*QuerySoftCancelledOrdersResponse) Descriptor() ([]byte, []int) { +func (m *QueryDerivativeMarketsResponse) Reset() { *m = QueryDerivativeMarketsResponse{} } +func (m *QueryDerivativeMarketsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryDerivativeMarketsResponse) ProtoMessage() {} +func (*QueryDerivativeMarketsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_d11505616d5f0a14, []int{9} } -func (m *QuerySoftCancelledOrdersResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryDerivativeMarketsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QuerySoftCancelledOrdersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryDerivativeMarketsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QuerySoftCancelledOrdersResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryDerivativeMarketsResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -542,27 +567,27 @@ func (m *QuerySoftCancelledOrdersResponse) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } -func (m *QuerySoftCancelledOrdersResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QuerySoftCancelledOrdersResponse.Merge(m, src) +func (m *QueryDerivativeMarketsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDerivativeMarketsResponse.Merge(m, src) } -func (m *QuerySoftCancelledOrdersResponse) XXX_Size() int { +func (m *QueryDerivativeMarketsResponse) XXX_Size() int { return m.Size() } -func (m *QuerySoftCancelledOrdersResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QuerySoftCancelledOrdersResponse.DiscardUnknown(m) +func (m *QueryDerivativeMarketsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryDerivativeMarketsResponse.DiscardUnknown(m) } -var xxx_messageInfo_QuerySoftCancelledOrdersResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryDerivativeMarketsResponse proto.InternalMessageInfo -func (m *QuerySoftCancelledOrdersResponse) GetOrderHashes() []string { +func (m *QueryDerivativeMarketsResponse) GetMarkets() []*DerivativeMarket { if m != nil { - return m.OrderHashes + return m.Markets } return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryOrderRequest defines the request type for +// Query/Order RPC method. type QueryOrderRequest struct { // The hash of the desired 0x order. OrderHash string `protobuf:"bytes,1,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` @@ -626,8 +651,8 @@ func (m *QueryOrderRequest) GetSubaccountID() string { return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryOrderResponse defines the response type for +// Query/Order RPC method. type QueryOrderResponse struct { // Order data Order *Order `protobuf:"bytes,1,opt,name=order,proto3" json:"order,omitempty"` @@ -673,8 +698,8 @@ func (m *QueryOrderResponse) GetOrder() *Order { return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryActiveOrderRequest defines the request type for +// Query/ActiveOrder RPC method. type QueryActiveOrderRequest struct { // The hash of the desired 0x order. OrderHash string `protobuf:"bytes,1,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` @@ -738,8 +763,8 @@ func (m *QueryActiveOrderRequest) GetSubaccountID() string { return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryActiveOrderResponse defines the request type for +// Query/ActiveOrder RPC method. type QueryActiveOrderResponse struct { // Order data Order *Order `protobuf:"bytes,1,opt,name=order,proto3" json:"order,omitempty"` @@ -785,126 +810,22 @@ func (m *QueryActiveOrderResponse) GetOrder() *Order { return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryZeroExTransactionRequest struct { - TxHash string `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` -} - -func (m *QueryZeroExTransactionRequest) Reset() { *m = QueryZeroExTransactionRequest{} } -func (m *QueryZeroExTransactionRequest) String() string { return proto.CompactTextString(m) } -func (*QueryZeroExTransactionRequest) ProtoMessage() {} -func (*QueryZeroExTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{14} -} -func (m *QueryZeroExTransactionRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryZeroExTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryZeroExTransactionRequest.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 *QueryZeroExTransactionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryZeroExTransactionRequest.Merge(m, src) -} -func (m *QueryZeroExTransactionRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryZeroExTransactionRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryZeroExTransactionRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryZeroExTransactionRequest proto.InternalMessageInfo - -func (m *QueryZeroExTransactionRequest) GetTxHash() string { - if m != nil { - return m.TxHash - } - return "" -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryZeroExTransactionResponse struct { - TxType int64 `protobuf:"zigzag64,1,opt,name=tx_type,json=txType,proto3" json:"tx_type,omitempty"` - FillRequests []*OrderFillRequest `protobuf:"bytes,2,rep,name=fill_requests,json=fillRequests,proto3" json:"fill_requests,omitempty"` - SoftCancelRequests []*OrderSoftCancelRequest `protobuf:"bytes,3,rep,name=soft_cancel_requests,json=softCancelRequests,proto3" json:"soft_cancel_requests,omitempty"` -} - -func (m *QueryZeroExTransactionResponse) Reset() { *m = QueryZeroExTransactionResponse{} } -func (m *QueryZeroExTransactionResponse) String() string { return proto.CompactTextString(m) } -func (*QueryZeroExTransactionResponse) ProtoMessage() {} -func (*QueryZeroExTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{15} -} -func (m *QueryZeroExTransactionResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryZeroExTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryZeroExTransactionResponse.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 *QueryZeroExTransactionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryZeroExTransactionResponse.Merge(m, src) -} -func (m *QueryZeroExTransactionResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryZeroExTransactionResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryZeroExTransactionResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryZeroExTransactionResponse proto.InternalMessageInfo - -func (m *QueryZeroExTransactionResponse) GetTxType() int64 { - if m != nil { - return m.TxType - } - return 0 -} - -func (m *QueryZeroExTransactionResponse) GetFillRequests() []*OrderFillRequest { - if m != nil { - return m.FillRequests - } - return nil -} - -func (m *QueryZeroExTransactionResponse) GetSoftCancelRequests() []*OrderSoftCancelRequest { - if m != nil { - return m.SoftCancelRequests - } - return nil -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryArchiveOrderRequest defines the request type for +// Query/ArchiveOrder RPC method. type QueryArchiveOrderRequest struct { // The hash of the desired 0x order. OrderHash string `protobuf:"bytes,1,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` + // The marketID the desired 0x order. + MarketId string `protobuf:"bytes,2,opt,name=market_id,json=marketId,proto3" json:"market_id,omitempty"` + // The subaccount the desired 0x derivative order. + SubaccountID string `protobuf:"bytes,3,opt,name=subaccount_i_d,json=subaccountID,proto3" json:"subaccount_i_d,omitempty"` } func (m *QueryArchiveOrderRequest) Reset() { *m = QueryArchiveOrderRequest{} } func (m *QueryArchiveOrderRequest) String() string { return proto.CompactTextString(m) } func (*QueryArchiveOrderRequest) ProtoMessage() {} func (*QueryArchiveOrderRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{16} + return fileDescriptor_d11505616d5f0a14, []int{14} } func (m *QueryArchiveOrderRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -940,8 +861,22 @@ func (m *QueryArchiveOrderRequest) GetOrderHash() string { return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +func (m *QueryArchiveOrderRequest) GetMarketId() string { + if m != nil { + return m.MarketId + } + return "" +} + +func (m *QueryArchiveOrderRequest) GetSubaccountID() string { + if m != nil { + return m.SubaccountID + } + return "" +} + +// QueryArchiveOrderResponse defines the request type for +// Query/ArchiveOrder RPC method. type QueryArchiveOrderResponse struct { // Order data Order *Order `protobuf:"bytes,1,opt,name=order,proto3" json:"order,omitempty"` @@ -951,7 +886,7 @@ func (m *QueryArchiveOrderResponse) Reset() { *m = QueryArchiveOrderResp func (m *QueryArchiveOrderResponse) String() string { return proto.CompactTextString(m) } func (*QueryArchiveOrderResponse) ProtoMessage() {} func (*QueryArchiveOrderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{17} + return fileDescriptor_d11505616d5f0a14, []int{15} } func (m *QueryArchiveOrderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -987,8 +922,6 @@ func (m *QueryArchiveOrderResponse) GetOrder() *Order { return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. type OrderFilters struct { // for derivatives ContractPriceBound string `protobuf:"bytes,1,opt,name=contract_price_bound,json=contractPriceBound,proto3" json:"contract_price_bound,omitempty"` @@ -1019,7 +952,8 @@ type OrderFilters struct { Direction string `protobuf:"bytes,21,opt,name=direction,proto3" json:"direction,omitempty"` // Filter out orders whose price is not less than or equal to the filter bound PriceLtOrEq string `protobuf:"bytes,22,opt,name=price_lt_or_eq,json=priceLtOrEq,proto3" json:"price_lt_or_eq,omitempty"` - // Filter out orders whose price is not greater than or equal to the filter bound + // Filter out orders whose price is not greater than or equal to the filter + // bound PriceGtOrEq string `protobuf:"bytes,23,opt,name=price_gt_or_eq,json=priceGtOrEq,proto3" json:"price_gt_or_eq,omitempty"` // Filters orders to satisfy the indexPriceMinMarginRequirement IndexPrice string `protobuf:"bytes,24,opt,name=index_price,json=indexPrice,proto3" json:"index_price,omitempty"` @@ -1031,7 +965,7 @@ func (m *OrderFilters) Reset() { *m = OrderFilters{} } func (m *OrderFilters) String() string { return proto.CompactTextString(m) } func (*OrderFilters) ProtoMessage() {} func (*OrderFilters) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{18} + return fileDescriptor_d11505616d5f0a14, []int{16} } func (m *OrderFilters) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1251,7 +1185,7 @@ func (m *QueryDerivativeOrdersRequest) Reset() { *m = QueryDerivativeOrd func (m *QueryDerivativeOrdersRequest) String() string { return proto.CompactTextString(m) } func (*QueryDerivativeOrdersRequest) ProtoMessage() {} func (*QueryDerivativeOrdersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{19} + return fileDescriptor_d11505616d5f0a14, []int{17} } func (m *QueryDerivativeOrdersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1325,7 +1259,7 @@ func (m *QuerySubaccountMarketDerivativeOrdersRequest) String() string { } func (*QuerySubaccountMarketDerivativeOrdersRequest) ProtoMessage() {} func (*QuerySubaccountMarketDerivativeOrdersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{20} + return fileDescriptor_d11505616d5f0a14, []int{18} } func (m *QuerySubaccountMarketDerivativeOrdersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1382,8 +1316,8 @@ func (m *QuerySubaccountMarketDerivativeOrdersRequest) GetSubaccountID() string return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QuerySpotOrdersRequest defines the request type for +// Query/SpotOrders RPC method. type QuerySpotOrdersRequest struct { Filters *OrderFilters `protobuf:"bytes,1,opt,name=filters,proto3" json:"filters,omitempty"` // Filter by status of the order @@ -1398,7 +1332,7 @@ func (m *QuerySpotOrdersRequest) Reset() { *m = QuerySpotOrdersRequest{} func (m *QuerySpotOrdersRequest) String() string { return proto.CompactTextString(m) } func (*QuerySpotOrdersRequest) ProtoMessage() {} func (*QuerySpotOrdersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{21} + return fileDescriptor_d11505616d5f0a14, []int{19} } func (m *QuerySpotOrdersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1455,8 +1389,8 @@ func (m *QuerySpotOrdersRequest) GetTradePairHash() string { return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QuerySpotOrdersResponse defines the request type for +// Query/SpotOrders RPC method. type QuerySpotOrdersResponse struct { // An array of matched orders. Records []*Order `protobuf:"bytes,1,rep,name=records,proto3" json:"records,omitempty"` @@ -1466,7 +1400,7 @@ func (m *QuerySpotOrdersResponse) Reset() { *m = QuerySpotOrdersResponse func (m *QuerySpotOrdersResponse) String() string { return proto.CompactTextString(m) } func (*QuerySpotOrdersResponse) ProtoMessage() {} func (*QuerySpotOrdersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{22} + return fileDescriptor_d11505616d5f0a14, []int{20} } func (m *QuerySpotOrdersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1502,25 +1436,33 @@ func (m *QuerySpotOrdersResponse) GetRecords() []*Order { return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryFillRequestsRequest struct { - // EIP712 hash of order (see LibOrder.getTypedDataHash) - OrderHash string `protobuf:"bytes,1,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` +// QueryTradePairRequest defines the request type for +// Query/TradePair RPC method. +type QueryTradePairRequest struct { + // Specify name of the trade pair. + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + // Most effective way is to specify hash of the trade pair. + Hash string `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` + // ABIv2 encoded data that can be decoded by a specified proxy contract when + // transferring makerAsset. + MakerAssetData string `protobuf:"bytes,3,opt,name=maker_asset_data,json=makerAssetData,proto3" json:"maker_asset_data,omitempty"` + // ABIv2 encoded data that can be decoded by a specified proxy contract when + // transferring takerAsset. + TakerAssetData string `protobuf:"bytes,4,opt,name=taker_asset_data,json=takerAssetData,proto3" json:"taker_asset_data,omitempty"` } -func (m *QueryFillRequestsRequest) Reset() { *m = QueryFillRequestsRequest{} } -func (m *QueryFillRequestsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryFillRequestsRequest) ProtoMessage() {} -func (*QueryFillRequestsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{23} +func (m *QueryTradePairRequest) Reset() { *m = QueryTradePairRequest{} } +func (m *QueryTradePairRequest) String() string { return proto.CompactTextString(m) } +func (*QueryTradePairRequest) ProtoMessage() {} +func (*QueryTradePairRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_d11505616d5f0a14, []int{21} } -func (m *QueryFillRequestsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryTradePairRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryFillRequestsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryTradePairRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryFillRequestsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryTradePairRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1530,383 +1472,48 @@ func (m *QueryFillRequestsRequest) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (m *QueryFillRequestsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFillRequestsRequest.Merge(m, src) +func (m *QueryTradePairRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryTradePairRequest.Merge(m, src) } -func (m *QueryFillRequestsRequest) XXX_Size() int { +func (m *QueryTradePairRequest) XXX_Size() int { return m.Size() } -func (m *QueryFillRequestsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFillRequestsRequest.DiscardUnknown(m) +func (m *QueryTradePairRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryTradePairRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryFillRequestsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryTradePairRequest proto.InternalMessageInfo -func (m *QueryFillRequestsRequest) GetOrderHash() string { +func (m *QueryTradePairRequest) GetName() string { if m != nil { - return m.OrderHash + return m.Name } return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type OrderFillRequest struct { - TxHash string `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` - OrderHash string `protobuf:"bytes,2,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` - ApprovalSignatures []string `protobuf:"bytes,3,rep,name=approval_signatures,json=approvalSignatures,proto3" json:"approval_signatures,omitempty"` - ExpiryAt int64 `protobuf:"zigzag64,4,opt,name=expiry_at,json=expiryAt,proto3" json:"expiry_at,omitempty"` - TakerAssetFillAmount string `protobuf:"bytes,5,opt,name=taker_asset_fill_amount,json=takerAssetFillAmount,proto3" json:"taker_asset_fill_amount,omitempty"` +func (m *QueryTradePairRequest) GetHash() string { + if m != nil { + return m.Hash + } + return "" } -func (m *OrderFillRequest) Reset() { *m = OrderFillRequest{} } -func (m *OrderFillRequest) String() string { return proto.CompactTextString(m) } -func (*OrderFillRequest) ProtoMessage() {} -func (*OrderFillRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{24} +func (m *QueryTradePairRequest) GetMakerAssetData() string { + if m != nil { + return m.MakerAssetData + } + return "" } -func (m *OrderFillRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OrderFillRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OrderFillRequest.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 *OrderFillRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_OrderFillRequest.Merge(m, src) -} -func (m *OrderFillRequest) XXX_Size() int { - return m.Size() -} -func (m *OrderFillRequest) XXX_DiscardUnknown() { - xxx_messageInfo_OrderFillRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_OrderFillRequest proto.InternalMessageInfo - -func (m *OrderFillRequest) GetTxHash() string { - if m != nil { - return m.TxHash - } - return "" -} - -func (m *OrderFillRequest) GetOrderHash() string { - if m != nil { - return m.OrderHash - } - return "" -} - -func (m *OrderFillRequest) GetApprovalSignatures() []string { - if m != nil { - return m.ApprovalSignatures - } - return nil -} - -func (m *OrderFillRequest) GetExpiryAt() int64 { - if m != nil { - return m.ExpiryAt - } - return 0 -} - -func (m *OrderFillRequest) GetTakerAssetFillAmount() string { - if m != nil { - return m.TakerAssetFillAmount - } - return "" -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type OrderSoftCancelRequest struct { - TxHash string `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` - OrderHash string `protobuf:"bytes,2,opt,name=order_hash,json=orderHash,proto3" json:"order_hash,omitempty"` - ApprovalSignatures []string `protobuf:"bytes,3,rep,name=approval_signatures,json=approvalSignatures,proto3" json:"approval_signatures,omitempty"` -} - -func (m *OrderSoftCancelRequest) Reset() { *m = OrderSoftCancelRequest{} } -func (m *OrderSoftCancelRequest) String() string { return proto.CompactTextString(m) } -func (*OrderSoftCancelRequest) ProtoMessage() {} -func (*OrderSoftCancelRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{25} -} -func (m *OrderSoftCancelRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OrderSoftCancelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OrderSoftCancelRequest.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 *OrderSoftCancelRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_OrderSoftCancelRequest.Merge(m, src) -} -func (m *OrderSoftCancelRequest) XXX_Size() int { - return m.Size() -} -func (m *OrderSoftCancelRequest) XXX_DiscardUnknown() { - xxx_messageInfo_OrderSoftCancelRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_OrderSoftCancelRequest proto.InternalMessageInfo - -func (m *OrderSoftCancelRequest) GetTxHash() string { - if m != nil { - return m.TxHash - } - return "" -} - -func (m *OrderSoftCancelRequest) GetOrderHash() string { - if m != nil { - return m.OrderHash - } - return "" -} - -func (m *OrderSoftCancelRequest) GetApprovalSignatures() []string { - if m != nil { - return m.ApprovalSignatures - } - return nil -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryFillRequestsResponse struct { - // Information about the signatures to fill the order. - FillRequests []*OrderFillRequest `protobuf:"bytes,1,rep,name=fill_requests,json=fillRequests,proto3" json:"fill_requests,omitempty"` -} - -func (m *QueryFillRequestsResponse) Reset() { *m = QueryFillRequestsResponse{} } -func (m *QueryFillRequestsResponse) String() string { return proto.CompactTextString(m) } -func (*QueryFillRequestsResponse) ProtoMessage() {} -func (*QueryFillRequestsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{26} -} -func (m *QueryFillRequestsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryFillRequestsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryFillRequestsResponse.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 *QueryFillRequestsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryFillRequestsResponse.Merge(m, src) -} -func (m *QueryFillRequestsResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryFillRequestsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryFillRequestsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryFillRequestsResponse proto.InternalMessageInfo - -func (m *QueryFillRequestsResponse) GetFillRequests() []*OrderFillRequest { - if m != nil { - return m.FillRequests - } - return nil -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryOutstandingFillRequestsRequest struct { - TxHash string `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` -} - -func (m *QueryOutstandingFillRequestsRequest) Reset() { *m = QueryOutstandingFillRequestsRequest{} } -func (m *QueryOutstandingFillRequestsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryOutstandingFillRequestsRequest) ProtoMessage() {} -func (*QueryOutstandingFillRequestsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{27} -} -func (m *QueryOutstandingFillRequestsRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryOutstandingFillRequestsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryOutstandingFillRequestsRequest.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 *QueryOutstandingFillRequestsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryOutstandingFillRequestsRequest.Merge(m, src) -} -func (m *QueryOutstandingFillRequestsRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryOutstandingFillRequestsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryOutstandingFillRequestsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryOutstandingFillRequestsRequest proto.InternalMessageInfo - -func (m *QueryOutstandingFillRequestsRequest) GetTxHash() string { - if m != nil { - return m.TxHash - } - return "" -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryOutstandingFillRequestsResponse struct { - // Information about the signatures to fill the order. - FillRequests []*OrderFillRequest `protobuf:"bytes,1,rep,name=fill_requests,json=fillRequests,proto3" json:"fill_requests,omitempty"` -} - -func (m *QueryOutstandingFillRequestsResponse) Reset() { *m = QueryOutstandingFillRequestsResponse{} } -func (m *QueryOutstandingFillRequestsResponse) String() string { return proto.CompactTextString(m) } -func (*QueryOutstandingFillRequestsResponse) ProtoMessage() {} -func (*QueryOutstandingFillRequestsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{28} -} -func (m *QueryOutstandingFillRequestsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryOutstandingFillRequestsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryOutstandingFillRequestsResponse.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 *QueryOutstandingFillRequestsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryOutstandingFillRequestsResponse.Merge(m, src) -} -func (m *QueryOutstandingFillRequestsResponse) XXX_Size() int { - return m.Size() -} -func (m *QueryOutstandingFillRequestsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryOutstandingFillRequestsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryOutstandingFillRequestsResponse proto.InternalMessageInfo - -func (m *QueryOutstandingFillRequestsResponse) GetFillRequests() []*OrderFillRequest { - if m != nil { - return m.FillRequests - } - return nil -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. -type QueryTradePairRequest struct { - // Specify name of the trade pair. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // Most effective way is to specify hash of the trade pair. - Hash string `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` - // ABIv2 encoded data that can be decoded by a specified proxy contract when - // transferring makerAsset. - MakerAssetData string `protobuf:"bytes,3,opt,name=maker_asset_data,json=makerAssetData,proto3" json:"maker_asset_data,omitempty"` - // ABIv2 encoded data that can be decoded by a specified proxy contract when - // transferring takerAsset. - TakerAssetData string `protobuf:"bytes,4,opt,name=taker_asset_data,json=takerAssetData,proto3" json:"taker_asset_data,omitempty"` -} - -func (m *QueryTradePairRequest) Reset() { *m = QueryTradePairRequest{} } -func (m *QueryTradePairRequest) String() string { return proto.CompactTextString(m) } -func (*QueryTradePairRequest) ProtoMessage() {} -func (*QueryTradePairRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{29} -} -func (m *QueryTradePairRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *QueryTradePairRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_QueryTradePairRequest.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 *QueryTradePairRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryTradePairRequest.Merge(m, src) -} -func (m *QueryTradePairRequest) XXX_Size() int { - return m.Size() -} -func (m *QueryTradePairRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryTradePairRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_QueryTradePairRequest proto.InternalMessageInfo - -func (m *QueryTradePairRequest) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *QueryTradePairRequest) GetHash() string { - if m != nil { - return m.Hash - } - return "" -} - -func (m *QueryTradePairRequest) GetMakerAssetData() string { - if m != nil { - return m.MakerAssetData - } - return "" + +func (m *QueryTradePairRequest) GetTakerAssetData() string { + if m != nil { + return m.TakerAssetData + } + return "" } -func (m *QueryTradePairRequest) GetTakerAssetData() string { - if m != nil { - return m.TakerAssetData - } - return "" -} - -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryTradePairResponse defines the request type for +// Query/TradePair RPC method. type QueryTradePairResponse struct { // A name of the pair in format AAA/BBB, where AAA - maker's asset, BBB - // taker's asset. @@ -1927,7 +1534,7 @@ func (m *QueryTradePairResponse) Reset() { *m = QueryTradePairResponse{} func (m *QueryTradePairResponse) String() string { return proto.CompactTextString(m) } func (*QueryTradePairResponse) ProtoMessage() {} func (*QueryTradePairResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{30} + return fileDescriptor_d11505616d5f0a14, []int{22} } func (m *QueryTradePairResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1991,8 +1598,8 @@ func (m *QueryTradePairResponse) GetEnabled() bool { return false } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryDerivativeMarketRequest defines the request type for +// Query/DerivativeMarket RPC method. type QueryDerivativeMarketRequest struct { MarketId string `protobuf:"bytes,1,opt,name=market_id,json=marketId,proto3" json:"market_id,omitempty"` Ticker string `protobuf:"bytes,2,opt,name=ticker,proto3" json:"ticker,omitempty"` @@ -2002,7 +1609,7 @@ func (m *QueryDerivativeMarketRequest) Reset() { *m = QueryDerivativeMar func (m *QueryDerivativeMarketRequest) String() string { return proto.CompactTextString(m) } func (*QueryDerivativeMarketRequest) ProtoMessage() {} func (*QueryDerivativeMarketRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{31} + return fileDescriptor_d11505616d5f0a14, []int{23} } func (m *QueryDerivativeMarketRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2045,8 +1652,8 @@ func (m *QueryDerivativeMarketRequest) GetTicker() string { return "" } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryDerivativeMarketResponse defines the request type for +// Query/DerivativeMarket RPC method. type QueryDerivativeMarketResponse struct { Market *DerivativeMarket `protobuf:"bytes,1,opt,name=market,proto3" json:"market,omitempty"` } @@ -2055,7 +1662,7 @@ func (m *QueryDerivativeMarketResponse) Reset() { *m = QueryDerivativeMa func (m *QueryDerivativeMarketResponse) String() string { return proto.CompactTextString(m) } func (*QueryDerivativeMarketResponse) ProtoMessage() {} func (*QueryDerivativeMarketResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{32} + return fileDescriptor_d11505616d5f0a14, []int{24} } func (m *QueryDerivativeMarketResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2091,8 +1698,8 @@ func (m *QueryDerivativeMarketResponse) GetMarket() *DerivativeMarket { return nil } -// QuerySoftCancelledOrdersRequest defines the request type for -// Query/SoftCancelledOrders RPC method. +// QueryTradePairsRequest defines the request type for +// Query/TradePairs RPC method. type QueryTradePairsRequest struct { } @@ -2100,7 +1707,7 @@ func (m *QueryTradePairsRequest) Reset() { *m = QueryTradePairsRequest{} func (m *QueryTradePairsRequest) String() string { return proto.CompactTextString(m) } func (*QueryTradePairsRequest) ProtoMessage() {} func (*QueryTradePairsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{33} + return fileDescriptor_d11505616d5f0a14, []int{25} } func (m *QueryTradePairsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2140,7 +1747,7 @@ func (m *QueryTradePairsResponse) Reset() { *m = QueryTradePairsResponse func (m *QueryTradePairsResponse) String() string { return proto.CompactTextString(m) } func (*QueryTradePairsResponse) ProtoMessage() {} func (*QueryTradePairsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{34} + return fileDescriptor_d11505616d5f0a14, []int{26} } func (m *QueryTradePairsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2187,7 +1794,7 @@ func (m *QueryDerivativeOrdersResponse) Reset() { *m = QueryDerivativeOr func (m *QueryDerivativeOrdersResponse) String() string { return proto.CompactTextString(m) } func (*QueryDerivativeOrdersResponse) ProtoMessage() {} func (*QueryDerivativeOrdersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{35} + return fileDescriptor_d11505616d5f0a14, []int{27} } func (m *QueryDerivativeOrdersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2238,7 +1845,7 @@ func (m *QuerySubaccountMarketDerivativeOrdersResponse) String() string { } func (*QuerySubaccountMarketDerivativeOrdersResponse) ProtoMessage() {} func (*QuerySubaccountMarketDerivativeOrdersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d11505616d5f0a14, []int{36} + return fileDescriptor_d11505616d5f0a14, []int{28} } func (m *QuerySubaccountMarketDerivativeOrdersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2281,16 +1888,14 @@ func init() { proto.RegisterType((*QuerySubaccountMarginHoldResponse)(nil), "injective.orders.v1beta1.QuerySubaccountMarginHoldResponse") proto.RegisterType((*QueryDerivativeOrderbookRequest)(nil), "injective.orders.v1beta1.QueryDerivativeOrderbookRequest") proto.RegisterType((*QueryDerivativeOrderbookResponse)(nil), "injective.orders.v1beta1.QueryDerivativeOrderbookResponse") + proto.RegisterType((*QueryMarginInfoRequest)(nil), "injective.orders.v1beta1.QueryMarginInfoRequest") + proto.RegisterType((*QueryMarginInfoResponse)(nil), "injective.orders.v1beta1.QueryMarginInfoResponse") proto.RegisterType((*QueryDerivativeMarketsRequest)(nil), "injective.orders.v1beta1.QueryDerivativeMarketsRequest") proto.RegisterType((*QueryDerivativeMarketsResponse)(nil), "injective.orders.v1beta1.QueryDerivativeMarketsResponse") - proto.RegisterType((*QuerySoftCancelledOrdersRequest)(nil), "injective.orders.v1beta1.QuerySoftCancelledOrdersRequest") - proto.RegisterType((*QuerySoftCancelledOrdersResponse)(nil), "injective.orders.v1beta1.QuerySoftCancelledOrdersResponse") proto.RegisterType((*QueryOrderRequest)(nil), "injective.orders.v1beta1.QueryOrderRequest") proto.RegisterType((*QueryOrderResponse)(nil), "injective.orders.v1beta1.QueryOrderResponse") proto.RegisterType((*QueryActiveOrderRequest)(nil), "injective.orders.v1beta1.QueryActiveOrderRequest") proto.RegisterType((*QueryActiveOrderResponse)(nil), "injective.orders.v1beta1.QueryActiveOrderResponse") - proto.RegisterType((*QueryZeroExTransactionRequest)(nil), "injective.orders.v1beta1.QueryZeroExTransactionRequest") - proto.RegisterType((*QueryZeroExTransactionResponse)(nil), "injective.orders.v1beta1.QueryZeroExTransactionResponse") proto.RegisterType((*QueryArchiveOrderRequest)(nil), "injective.orders.v1beta1.QueryArchiveOrderRequest") proto.RegisterType((*QueryArchiveOrderResponse)(nil), "injective.orders.v1beta1.QueryArchiveOrderResponse") proto.RegisterType((*OrderFilters)(nil), "injective.orders.v1beta1.OrderFilters") @@ -2298,12 +1903,6 @@ func init() { proto.RegisterType((*QuerySubaccountMarketDerivativeOrdersRequest)(nil), "injective.orders.v1beta1.QuerySubaccountMarketDerivativeOrdersRequest") proto.RegisterType((*QuerySpotOrdersRequest)(nil), "injective.orders.v1beta1.QuerySpotOrdersRequest") proto.RegisterType((*QuerySpotOrdersResponse)(nil), "injective.orders.v1beta1.QuerySpotOrdersResponse") - proto.RegisterType((*QueryFillRequestsRequest)(nil), "injective.orders.v1beta1.QueryFillRequestsRequest") - proto.RegisterType((*OrderFillRequest)(nil), "injective.orders.v1beta1.OrderFillRequest") - proto.RegisterType((*OrderSoftCancelRequest)(nil), "injective.orders.v1beta1.OrderSoftCancelRequest") - proto.RegisterType((*QueryFillRequestsResponse)(nil), "injective.orders.v1beta1.QueryFillRequestsResponse") - proto.RegisterType((*QueryOutstandingFillRequestsRequest)(nil), "injective.orders.v1beta1.QueryOutstandingFillRequestsRequest") - proto.RegisterType((*QueryOutstandingFillRequestsResponse)(nil), "injective.orders.v1beta1.QueryOutstandingFillRequestsResponse") proto.RegisterType((*QueryTradePairRequest)(nil), "injective.orders.v1beta1.QueryTradePairRequest") proto.RegisterType((*QueryTradePairResponse)(nil), "injective.orders.v1beta1.QueryTradePairResponse") proto.RegisterType((*QueryDerivativeMarketRequest)(nil), "injective.orders.v1beta1.QueryDerivativeMarketRequest") @@ -2319,139 +1918,117 @@ func init() { } var fileDescriptor_d11505616d5f0a14 = []byte{ - // 2097 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xbf, 0x6f, 0xdc, 0xc8, - 0xf5, 0x37, 0x25, 0x59, 0x3f, 0x9e, 0x7e, 0x58, 0x1e, 0xc9, 0xd2, 0x7a, 0xbf, 0x3e, 0x49, 0xa6, - 0x24, 0x9f, 0xec, 0x93, 0x77, 0x25, 0xf9, 0xeb, 0xf3, 0xd9, 0xe7, 0x33, 0x62, 0x9f, 0xec, 0x3b, - 0x23, 0x72, 0x7c, 0x5e, 0xbb, 0x08, 0xdc, 0x10, 0xb3, 0xe4, 0xec, 0x8a, 0x27, 0x2e, 0xb9, 0xe2, - 0xcc, 0x2a, 0x52, 0x52, 0x25, 0x45, 0xea, 0x03, 0xae, 0x08, 0x02, 0xa4, 0x48, 0x91, 0x22, 0x45, - 0x90, 0x00, 0x09, 0x90, 0x22, 0x48, 0x91, 0x74, 0x57, 0x04, 0x88, 0x81, 0x34, 0x57, 0x06, 0x76, - 0xea, 0xfc, 0x05, 0x29, 0x02, 0xce, 0x0f, 0x92, 0xbb, 0x24, 0x97, 0x5c, 0x2b, 0x39, 0x20, 0x9d, - 0xf6, 0xf1, 0xf3, 0xe6, 0x7d, 0xde, 0x9b, 0x37, 0xef, 0xbd, 0x21, 0x05, 0x6b, 0xb6, 0xfb, 0x39, - 0x31, 0x99, 0x7d, 0x44, 0xaa, 0x9e, 0x6f, 0x11, 0x9f, 0x56, 0x8f, 0xb6, 0xeb, 0x84, 0xe1, 0xed, - 0xea, 0x61, 0x87, 0xf8, 0x27, 0x95, 0xb6, 0xef, 0x31, 0x0f, 0x95, 0x42, 0x54, 0x45, 0xa0, 0x2a, - 0x12, 0x55, 0xbe, 0xd4, 0xf4, 0xbc, 0xa6, 0x43, 0xaa, 0xb8, 0x6d, 0x57, 0xb1, 0xeb, 0x7a, 0x0c, - 0x33, 0xdb, 0x73, 0xa9, 0xd0, 0x2b, 0xaf, 0x67, 0xae, 0x2e, 0x97, 0xe1, 0x30, 0xfd, 0xa7, 0x1a, - 0x5c, 0x7e, 0x16, 0x98, 0xdb, 0x25, 0xbe, 0x7d, 0x84, 0x03, 0xfc, 0x53, 0xfe, 0xfc, 0x59, 0xc7, - 0x63, 0xa4, 0x46, 0x0e, 0x3b, 0x84, 0x32, 0x54, 0x86, 0xf1, 0xc3, 0x0e, 0x76, 0x99, 0xcd, 0x4e, - 0x4a, 0xda, 0x8a, 0xb6, 0x31, 0x51, 0x0b, 0x7f, 0xa3, 0xff, 0x83, 0x89, 0x16, 0xf6, 0x0f, 0x08, - 0x33, 0x6c, 0xab, 0x34, 0x24, 0x1e, 0x0a, 0xc1, 0x63, 0x0b, 0x2d, 0xc0, 0xa8, 0x4d, 0xf7, 0x3c, - 0xb7, 0x59, 0x1a, 0x5e, 0xd1, 0x36, 0xc6, 0x6b, 0xf2, 0x17, 0x5a, 0x85, 0xe9, 0x16, 0x3e, 0x20, - 0xbe, 0x81, 0x2d, 0xcb, 0x27, 0x94, 0x96, 0x46, 0xb8, 0xe2, 0x14, 0x17, 0xde, 0x17, 0x32, 0xbd, - 0x0e, 0x7a, 0x3f, 0x6a, 0xb4, 0xed, 0xb9, 0x94, 0xa0, 0xbb, 0x30, 0x7a, 0x18, 0x08, 0x68, 0x49, - 0x5b, 0x19, 0xde, 0x98, 0xdc, 0x59, 0xab, 0x64, 0x45, 0xac, 0xc2, 0xd5, 0x85, 0xb6, 0xd4, 0xd1, - 0x7f, 0xa3, 0xc1, 0x0a, 0x37, 0xf2, 0xbc, 0x53, 0xc7, 0xa6, 0xe9, 0x75, 0x5c, 0xf6, 0x04, 0xfb, - 0x4d, 0xdb, 0xfd, 0xd4, 0x73, 0x2c, 0xe5, 0x7e, 0x82, 0xad, 0x96, 0x64, 0x1b, 0xc4, 0x81, 0x71, - 0x50, 0x83, 0x10, 0x15, 0x07, 0x2e, 0x78, 0x44, 0x48, 0xb0, 0x42, 0x1d, 0x53, 0x62, 0x98, 0x1d, - 0xdf, 0x27, 0xae, 0x79, 0xc2, 0xc3, 0x31, 0x51, 0x9b, 0x0a, 0x84, 0x1f, 0x4b, 0x19, 0x5a, 0x83, - 0x19, 0x1a, 0xb2, 0x30, 0x6c, 0xc3, 0x52, 0x51, 0x89, 0xa4, 0x8f, 0x77, 0xf5, 0x5d, 0xb9, 0x61, - 0xe9, 0x84, 0x65, 0x50, 0x96, 0x61, 0xb2, 0xc5, 0xa5, 0xc6, 0xbe, 0xe7, 0x58, 0x92, 0x2f, 0xb4, - 0x42, 0xa0, 0x7e, 0x0f, 0x96, 0xd3, 0x62, 0x5b, 0xf7, 0xbc, 0x03, 0xe5, 0x75, 0xd7, 0xc6, 0x6a, - 0xdd, 0x1b, 0xab, 0xff, 0x4c, 0xc5, 0x2d, 0x75, 0x81, 0x68, 0x6b, 0xe8, 0xbe, 0xe7, 0xb3, 0x02, - 0x5b, 0xf3, 0x99, 0x6f, 0x9b, 0x64, 0x8f, 0x1c, 0x11, 0xa7, 0x26, 0x75, 0xd0, 0x1d, 0x38, 0xeb, - 0x78, 0x6e, 0x93, 0x96, 0x86, 0x06, 0x50, 0x16, 0x2a, 0xfa, 0x32, 0xbc, 0xd3, 0xc3, 0xee, 0x09, - 0x67, 0x4e, 0xa5, 0x73, 0x7a, 0x03, 0x96, 0xb2, 0x00, 0x92, 0xfc, 0x2e, 0x8c, 0x09, 0x6f, 0x15, - 0xfb, 0x6b, 0xd9, 0x04, 0x7a, 0x57, 0xa9, 0x29, 0x55, 0xdd, 0x90, 0x71, 0x7e, 0xee, 0x35, 0xd8, - 0xc7, 0xd8, 0x35, 0x89, 0xe3, 0x10, 0x4b, 0xa4, 0xb1, 0x8a, 0xf3, 0x65, 0x98, 0xe2, 0xcb, 0x19, - 0xfb, 0x98, 0xee, 0xcb, 0x34, 0x9e, 0xa8, 0x4d, 0x72, 0xd9, 0xa7, 0x5c, 0x84, 0x2e, 0xc2, 0xb8, - 0xb9, 0x8f, 0x6d, 0x57, 0x1d, 0x31, 0x54, 0x1b, 0xe3, 0xbf, 0x1f, 0x5b, 0xfa, 0x43, 0x95, 0xbf, - 0x69, 0x06, 0xa4, 0x2b, 0xf9, 0x16, 0xf4, 0x0e, 0x9c, 0xe7, 0xcb, 0x70, 0x4d, 0xc5, 0xec, 0x1d, - 0x80, 0x48, 0x4f, 0xa6, 0xc0, 0x44, 0xa8, 0xd5, 0xff, 0xe4, 0x27, 0x93, 0x79, 0x38, 0x25, 0x99, - 0xbf, 0x0d, 0x28, 0x6e, 0x56, 0xf2, 0xbd, 0x09, 0x67, 0xb9, 0x15, 0x6e, 0x72, 0x72, 0x67, 0x39, - 0xe7, 0x44, 0xd7, 0x04, 0x5a, 0xff, 0x01, 0x2c, 0xf2, 0xc5, 0xee, 0x9b, 0x61, 0x3a, 0x7e, 0x73, - 0x9e, 0x3c, 0x83, 0x52, 0xd2, 0xf8, 0xe9, 0xfc, 0xf9, 0x40, 0x26, 0xf1, 0x4b, 0xe2, 0x7b, 0x0f, - 0x8f, 0x5f, 0xf8, 0xd8, 0xa5, 0xd8, 0x0c, 0x6a, 0xbc, 0xf2, 0x6a, 0x11, 0xc6, 0xd8, 0x71, 0xdc, - 0xa5, 0x51, 0x76, 0x1c, 0xf8, 0xa3, 0xff, 0x53, 0x93, 0xe9, 0x9d, 0xa2, 0x2a, 0x39, 0x09, 0x5d, - 0x76, 0xd2, 0x26, 0x5c, 0x17, 0x05, 0xba, 0x2f, 0x4e, 0xda, 0x04, 0x3d, 0x85, 0xe9, 0x86, 0xed, - 0x38, 0x86, 0x2f, 0x8c, 0xa8, 0xe3, 0x77, 0x2d, 0x87, 0xf4, 0x23, 0xdb, 0x71, 0x24, 0xaf, 0xda, - 0x54, 0x23, 0xfa, 0x41, 0x51, 0x1d, 0xe6, 0xa9, 0xd7, 0x60, 0x86, 0xc9, 0xb3, 0x33, 0x5a, 0x77, - 0x98, 0xaf, 0xbb, 0x95, 0xb3, 0x6e, 0x94, 0xd7, 0x6a, 0x75, 0x44, 0x7b, 0x45, 0x54, 0xbf, 0xad, - 0xa2, 0xef, 0x9b, 0xfb, 0x83, 0xed, 0xbd, 0x5e, 0x83, 0x8b, 0x29, 0xaa, 0xa7, 0xdb, 0xb9, 0x1f, - 0x8f, 0xc3, 0x94, 0x8a, 0x0a, 0x23, 0x3e, 0x45, 0x5b, 0x30, 0x6f, 0x7a, 0x2e, 0xf3, 0xb1, 0xc9, - 0x8c, 0x76, 0x50, 0xad, 0x8c, 0xba, 0xd7, 0x71, 0x55, 0x59, 0x45, 0xea, 0x19, 0x2f, 0x64, 0x0f, - 0x82, 0x27, 0xfd, 0x53, 0x72, 0x11, 0xc6, 0x6c, 0x6a, 0x38, 0xc9, 0xbe, 0xba, 0x0c, 0x93, 0xae, - 0xc7, 0x0c, 0x72, 0xdc, 0xb6, 0x7d, 0x22, 0xfa, 0xc7, 0x78, 0x0d, 0x5c, 0x8f, 0x3d, 0x14, 0x12, - 0x54, 0x81, 0x39, 0xd9, 0xca, 0x28, 0x25, 0x2c, 0x6c, 0x68, 0x67, 0xb9, 0x81, 0xf3, 0xa2, 0xa1, - 0x05, 0x4f, 0x54, 0x57, 0xab, 0xc0, 0x1c, 0x4b, 0xc1, 0x8f, 0x0a, 0x3c, 0x4b, 0xe0, 0xaf, 0xc2, - 0x2c, 0x39, 0x36, 0xf7, 0xb1, 0xdb, 0x24, 0x21, 0x78, 0x8c, 0x83, 0xcf, 0x29, 0xb9, 0x82, 0xae, - 0xc3, 0x0c, 0x25, 0xae, 0x15, 0x6b, 0xab, 0xe3, 0x1c, 0x38, 0x2d, 0xa4, 0x0a, 0xb6, 0x01, 0xb3, - 0x71, 0xc6, 0x16, 0x66, 0xb8, 0x34, 0xc1, 0x81, 0x33, 0x11, 0xdd, 0x5d, 0xcc, 0x70, 0x80, 0x64, - 0xbd, 0x48, 0x10, 0x48, 0xd6, 0x8d, 0xdc, 0x04, 0xd4, 0x15, 0x85, 0x56, 0x70, 0x88, 0x4b, 0x93, - 0x1c, 0x3b, 0x1b, 0x0b, 0x02, 0x97, 0x07, 0x68, 0x96, 0x44, 0x4f, 0x09, 0x34, 0xeb, 0x45, 0x27, - 0x86, 0x85, 0xe9, 0x94, 0x61, 0xe1, 0x1a, 0x9c, 0x0f, 0xf6, 0xa9, 0x1b, 0x38, 0x23, 0xe2, 0xe4, - 0x7a, 0xec, 0x49, 0x1c, 0xbb, 0x0a, 0xd3, 0xac, 0x0b, 0x77, 0x4e, 0x2c, 0xc8, 0xe2, 0xa0, 0x75, - 0x98, 0x61, 0x3e, 0x8e, 0x07, 0x73, 0x56, 0x04, 0x53, 0x48, 0x15, 0x6c, 0x07, 0x2e, 0x34, 0x08, - 0x31, 0x7c, 0x62, 0xda, 0x6d, 0x9b, 0xb8, 0xd1, 0x86, 0x9e, 0xe7, 0xe8, 0xb9, 0x06, 0x21, 0x35, - 0xf5, 0x4c, 0xe9, 0x54, 0x61, 0xbe, 0xa5, 0x06, 0x9b, 0x78, 0x68, 0x51, 0x2c, 0x67, 0x1e, 0x11, - 0x12, 0x45, 0xb7, 0x0a, 0xf3, 0x2c, 0x4d, 0x61, 0x2e, 0x96, 0x34, 0x5d, 0x0a, 0x57, 0x61, 0x36, - 0x56, 0x61, 0x5d, 0xcf, 0x35, 0x49, 0x69, 0x5e, 0x04, 0x23, 0x92, 0x7f, 0x27, 0x10, 0xa3, 0x4b, - 0x30, 0x61, 0xd9, 0x3e, 0xe1, 0xb5, 0xac, 0x74, 0x41, 0x9c, 0xe5, 0x50, 0x80, 0x56, 0x61, 0x46, - 0x9c, 0x2e, 0x87, 0x19, 0x9e, 0x6f, 0x90, 0xc3, 0xd2, 0x02, 0x87, 0x4c, 0x72, 0xe9, 0x1e, 0x7b, - 0xea, 0x3f, 0x3c, 0x8c, 0x40, 0x4d, 0x05, 0x5a, 0x8c, 0x81, 0x3e, 0x11, 0xa0, 0x65, 0x98, 0xb4, - 0x5d, 0x8b, 0x1c, 0x8b, 0xd3, 0x5a, 0x2a, 0x89, 0x01, 0x8a, 0x8b, 0xf8, 0x21, 0x4d, 0xe9, 0x0a, - 0x17, 0x53, 0xba, 0xc2, 0x9f, 0x34, 0xb8, 0x94, 0x3a, 0xc3, 0xaa, 0xe2, 0xf4, 0x2d, 0x18, 0x6b, - 0x88, 0x1a, 0x21, 0x4b, 0xcc, 0x95, 0xfc, 0x3a, 0x1b, 0xa0, 0x6b, 0x4a, 0x2d, 0x18, 0xb1, 0x29, - 0xc3, 0xac, 0x43, 0x65, 0x95, 0x90, 0xbf, 0xd0, 0x12, 0x80, 0xe9, 0x39, 0x8e, 0x0c, 0x95, 0x68, - 0x59, 0x31, 0x09, 0xba, 0x02, 0xe7, 0x78, 0x6e, 0x18, 0x6d, 0x6c, 0xcb, 0xda, 0x38, 0x12, 0x4b, - 0x99, 0xcf, 0xb0, 0x2d, 0xea, 0xe3, 0xef, 0x34, 0xd8, 0x4c, 0x0e, 0x9c, 0x07, 0x84, 0x65, 0xb9, - 0xd4, 0x6f, 0x6e, 0x4c, 0x9e, 0x8e, 0xa1, 0xbc, 0x51, 0x7a, 0xb8, 0x67, 0x94, 0x2e, 0x36, 0x25, - 0xff, 0x41, 0x83, 0x05, 0xc1, 0xba, 0xed, 0xb1, 0xff, 0xb5, 0x90, 0xbf, 0x90, 0x83, 0x4c, 0x9c, - 0xbb, 0x6c, 0x48, 0xb7, 0x61, 0xcc, 0x27, 0xa6, 0xe7, 0x5b, 0x6a, 0x2a, 0xcd, 0x6d, 0x49, 0x0a, - 0x1f, 0xf6, 0xc8, 0x58, 0xa7, 0xa6, 0x05, 0x7b, 0xe4, 0x5f, 0x35, 0x98, 0xed, 0xed, 0xf2, 0x99, - 0xd3, 0x47, 0xcf, 0x62, 0x43, 0xbd, 0xc3, 0x56, 0x15, 0xe6, 0x70, 0xbb, 0xed, 0x7b, 0x47, 0xd8, - 0x31, 0xa8, 0xdd, 0x74, 0x31, 0xeb, 0xf8, 0x44, 0x8c, 0x03, 0x13, 0x35, 0xa4, 0x1e, 0x3d, 0x0f, - 0x9f, 0x04, 0xe9, 0xc0, 0x1b, 0xda, 0x89, 0x81, 0x19, 0x0f, 0x18, 0xaa, 0x8d, 0x0b, 0xc1, 0x7d, - 0x86, 0x6e, 0xc2, 0x62, 0xbc, 0x38, 0xf3, 0xd1, 0x45, 0x56, 0x68, 0xd1, 0xd4, 0xe6, 0xa3, 0x0a, - 0x1d, 0xb0, 0x17, 0x55, 0x5a, 0xff, 0xa1, 0x06, 0x0b, 0xe9, 0xf3, 0xc5, 0x37, 0xe6, 0x97, 0xee, - 0xc8, 0xc9, 0xa3, 0x7b, 0x43, 0xe4, 0x46, 0x27, 0xc6, 0x30, 0xed, 0x74, 0x63, 0x98, 0x7e, 0x0f, - 0x56, 0xc5, 0xa8, 0xdd, 0x61, 0x94, 0x61, 0xd7, 0xb2, 0xdd, 0x66, 0x5a, 0x26, 0x64, 0xce, 0x94, - 0xdf, 0x83, 0xb5, 0xfe, 0xfa, 0xff, 0x2d, 0xe2, 0x5f, 0x6a, 0x70, 0x81, 0x5b, 0x7e, 0xa1, 0x0e, - 0x89, 0xe2, 0x8a, 0x60, 0xc4, 0xc5, 0x2d, 0x22, 0x89, 0xf2, 0xbf, 0x03, 0x59, 0x6c, 0x7b, 0xf8, - 0xdf, 0xa9, 0x23, 0xc4, 0x70, 0xe1, 0x11, 0x62, 0x24, 0x6d, 0x84, 0xd0, 0x7f, 0xad, 0x0a, 0x4c, - 0x8c, 0x95, 0x8c, 0x40, 0x1a, 0xad, 0x34, 0x0a, 0x43, 0x85, 0x29, 0x0c, 0xa7, 0x4e, 0x31, 0xca, - 0xd5, 0x91, 0x98, 0xab, 0x25, 0x18, 0x23, 0x2e, 0xae, 0x3b, 0xc4, 0xe2, 0xe9, 0x3f, 0x5e, 0x53, - 0x3f, 0xf5, 0xe7, 0x89, 0x4e, 0x24, 0xef, 0xaa, 0x45, 0xca, 0xf6, 0x02, 0x8c, 0x32, 0xdb, 0x3c, - 0x20, 0xbe, 0xaa, 0x78, 0xe2, 0x97, 0x6e, 0x66, 0xdc, 0xb3, 0xc3, 0x58, 0x3c, 0x80, 0x51, 0xb1, - 0x88, 0xac, 0xb5, 0x83, 0x5c, 0xa2, 0xa5, 0xa6, 0x5e, 0xea, 0x8d, 0x74, 0x78, 0x8b, 0xff, 0xae, - 0x2c, 0x94, 0xf1, 0x27, 0xd2, 0xf0, 0x47, 0xbd, 0x85, 0x72, 0x35, 0xdb, 0x72, 0xb4, 0x85, 0x61, - 0xb1, 0x7c, 0x99, 0x70, 0xec, 0x3f, 0x57, 0x88, 0x3f, 0x87, 0xeb, 0x05, 0x1b, 0xea, 0xa9, 0x6d, - 0xed, 0xfc, 0xe4, 0x22, 0x9c, 0xe5, 0xc6, 0xd0, 0x17, 0x1a, 0x40, 0x74, 0xd7, 0x46, 0xef, 0x65, - 0x2f, 0x91, 0x78, 0x11, 0x50, 0xde, 0x2c, 0x06, 0x16, 0x74, 0xf5, 0x77, 0x7f, 0xf4, 0xb7, 0x7f, - 0x7c, 0x39, 0x74, 0x19, 0x2d, 0x57, 0xfb, 0xbf, 0x83, 0x44, 0xbf, 0xd4, 0x60, 0xb6, 0xf7, 0xd2, - 0x8c, 0xb6, 0x73, 0x6c, 0x25, 0x6f, 0xf7, 0xe5, 0x9d, 0x41, 0x54, 0x24, 0xc9, 0xeb, 0x9c, 0xe4, - 0xbb, 0x68, 0x3d, 0x9b, 0x24, 0x8e, 0xb1, 0xfa, 0x95, 0x26, 0x5f, 0x90, 0xc4, 0xaf, 0x89, 0x28, - 0xd7, 0x70, 0xf2, 0x3a, 0x5a, 0xbe, 0x31, 0x90, 0x8e, 0x64, 0x5b, 0xe1, 0x6c, 0x37, 0xd0, 0x95, - 0x3e, 0x6c, 0xe3, 0xc4, 0x7e, 0xa1, 0xc1, 0xb9, 0x9e, 0x11, 0x02, 0x6d, 0xe5, 0x18, 0x4e, 0x4c, - 0x4a, 0xe5, 0xed, 0x01, 0x34, 0x24, 0xd1, 0x4d, 0x4e, 0xf4, 0x0a, 0x5a, 0xcb, 0x26, 0x4a, 0x23, - 0x4a, 0x3f, 0xd7, 0x60, 0xa6, 0xfb, 0x00, 0xa3, 0x6a, 0x8e, 0xcd, 0xde, 0x26, 0x50, 0xde, 0x2a, - 0xae, 0x20, 0x39, 0xbe, 0xc7, 0x39, 0xae, 0xa3, 0xd5, 0x6c, 0x8e, 0xe1, 0x3c, 0x16, 0x45, 0x32, - 0xaa, 0x31, 0xa8, 0xb0, 0xc9, 0xc2, 0x91, 0x4c, 0x16, 0xb0, 0x22, 0x91, 0x64, 0x11, 0xa5, 0xdf, - 0xaa, 0x26, 0xd9, 0x5b, 0x45, 0xd1, 0xfb, 0x39, 0xa6, 0x33, 0xfa, 0x41, 0xf9, 0xd6, 0xc0, 0x7a, - 0x92, 0xf8, 0x06, 0x27, 0xae, 0xa3, 0x95, 0x6c, 0xe2, 0xa2, 0xb0, 0xa3, 0xdf, 0xab, 0x1e, 0x9a, - 0x78, 0x0b, 0x8b, 0x06, 0xb5, 0x1e, 0x46, 0xfa, 0x83, 0xc1, 0x15, 0x25, 0xef, 0xab, 0x9c, 0xf7, - 0x2a, 0xba, 0x9c, 0xc7, 0x9b, 0xa2, 0x3f, 0x26, 0xa3, 0x2d, 0x33, 0xba, 0x78, 0xb4, 0xbb, 0x8f, - 0xda, 0xad, 0x81, 0xf5, 0x24, 0xeb, 0x1d, 0xce, 0x7a, 0x13, 0x5d, 0xcb, 0x66, 0x6d, 0xf5, 0x92, - 0xfc, 0x97, 0x06, 0xeb, 0x85, 0x3a, 0x10, 0x7a, 0x94, 0x57, 0x01, 0x8a, 0xdd, 0x09, 0xcb, 0x9f, - 0x9c, 0x7a, 0x1d, 0xe9, 0xee, 0x03, 0xee, 0xee, 0x5d, 0x74, 0xa7, 0x4f, 0x7d, 0xc9, 0x73, 0xea, - 0xcf, 0x2a, 0xed, 0x12, 0x6f, 0x47, 0x73, 0xd3, 0x2e, 0xeb, 0x55, 0x6c, 0x6e, 0xda, 0x65, 0xbe, - 0x88, 0xd5, 0xff, 0x9f, 0x7b, 0x54, 0x41, 0x9b, 0xd9, 0x1e, 0x7d, 0x9f, 0xf8, 0x1e, 0x89, 0x2b, - 0x53, 0xf4, 0x95, 0x26, 0x6f, 0x73, 0x29, 0xef, 0xfd, 0xd1, 0xed, 0xbc, 0x68, 0x67, 0x7e, 0x8c, - 0x28, 0xdf, 0x79, 0x1b, 0x55, 0xe9, 0xc9, 0x4d, 0xee, 0x49, 0x15, 0x5d, 0xef, 0xb3, 0x37, 0x29, - 0x6c, 0xbf, 0x56, 0xef, 0x48, 0x32, 0x6e, 0x16, 0xe8, 0xa3, 0xbc, 0xe9, 0xa3, 0xef, 0x8d, 0xa6, - 0x7c, 0xef, 0x6d, 0xd5, 0xa5, 0x5b, 0xb7, 0xb9, 0x5b, 0x37, 0xd0, 0x76, 0x9f, 0x71, 0x26, 0x83, - 0x79, 0x38, 0x35, 0x74, 0x49, 0xf3, 0xa6, 0x86, 0x34, 0x27, 0x6e, 0x0c, 0xa4, 0x53, 0x7c, 0x6a, - 0xe8, 0x7a, 0x53, 0xff, 0x4a, 0x83, 0x72, 0xf6, 0x17, 0x57, 0xf4, 0xe1, 0x80, 0x35, 0x2a, 0xfe, - 0x09, 0xb9, 0x7c, 0xf7, 0xed, 0x94, 0xa5, 0x27, 0xb7, 0xb8, 0x27, 0xdb, 0xa8, 0x5a, 0xbc, 0xca, - 0x09, 0xce, 0x7f, 0xd1, 0xe4, 0x25, 0x3b, 0xed, 0x73, 0x29, 0xba, 0x33, 0x48, 0x59, 0xea, 0xfe, - 0x28, 0x5c, 0xfe, 0xf0, 0xad, 0x74, 0xa5, 0x3f, 0xef, 0x73, 0x7f, 0xb6, 0x50, 0xa5, 0x60, 0x19, - 0x53, 0x84, 0xc3, 0x63, 0x9f, 0xf2, 0xd9, 0x35, 0xf7, 0xd8, 0x67, 0x7f, 0xeb, 0xcd, 0x3d, 0xf6, - 0x7d, 0xbe, 0xf2, 0x16, 0x39, 0xf6, 0x56, 0x52, 0xfd, 0x41, 0xe3, 0xab, 0xd7, 0x4b, 0xda, 0xab, - 0xd7, 0x4b, 0xda, 0xdf, 0x5f, 0x2f, 0x69, 0x5f, 0xbc, 0x59, 0x3a, 0xf3, 0xea, 0xcd, 0xd2, 0x99, - 0xaf, 0xdf, 0x2c, 0x9d, 0x79, 0xb9, 0xd7, 0xb4, 0xd9, 0x7e, 0xa7, 0x5e, 0x31, 0xbd, 0x56, 0xf5, - 0xb1, 0x5a, 0x72, 0x0f, 0xd7, 0x69, 0x64, 0xe0, 0xba, 0xe9, 0xf9, 0x24, 0xfe, 0x73, 0x1f, 0xdb, - 0x6e, 0xb5, 0xe5, 0x59, 0x1d, 0x87, 0x50, 0x65, 0x9d, 0x9d, 0xb4, 0x09, 0xad, 0x8f, 0xf2, 0x7f, - 0x74, 0xb8, 0xf1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0x01, 0x27, 0x01, 0x6f, 0x21, 0x00, - 0x00, + // 1759 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0x13, 0xd7, + 0x16, 0x67, 0xf2, 0x9d, 0x93, 0xef, 0x9b, 0x10, 0x06, 0x3f, 0x70, 0xc2, 0xe4, 0x83, 0x00, 0x89, + 0x9d, 0x04, 0x01, 0x8f, 0xc0, 0x7b, 0x7a, 0xe4, 0x85, 0x40, 0xd4, 0x50, 0xc0, 0xb0, 0xa8, 0xd8, + 0xb8, 0xe3, 0x99, 0x6b, 0x7b, 0x88, 0x3d, 0xd7, 0x99, 0xb9, 0x8e, 0x88, 0xda, 0x55, 0x17, 0x5d, + 0x23, 0xb1, 0xaa, 0xd4, 0x45, 0x17, 0xad, 0xd4, 0x45, 0xd5, 0x4a, 0xad, 0xd4, 0x45, 0xd5, 0x45, + 0x97, 0x2c, 0xba, 0x88, 0xd4, 0x4d, 0x97, 0x15, 0xf4, 0xcf, 0xe8, 0xa2, 0x9a, 0xfb, 0xe1, 0x19, + 0x7b, 0xc6, 0xf6, 0x98, 0x20, 0xa4, 0xee, 0x3c, 0x67, 0x7e, 0xe7, 0x9e, 0xdf, 0x39, 0xe7, 0xde, + 0x73, 0xce, 0x5c, 0xc3, 0xbc, 0x65, 0x3f, 0xc5, 0x06, 0xb5, 0x0e, 0x70, 0x9a, 0x38, 0x26, 0x76, + 0xdc, 0xf4, 0xc1, 0x5a, 0x0e, 0x53, 0x7d, 0x2d, 0xbd, 0x5f, 0xc5, 0xce, 0x61, 0xaa, 0xe2, 0x10, + 0x4a, 0x90, 0x5a, 0x43, 0xa5, 0x38, 0x2a, 0x25, 0x50, 0x89, 0x33, 0x05, 0x42, 0x0a, 0x25, 0x9c, + 0xd6, 0x2b, 0x56, 0x5a, 0xb7, 0x6d, 0x42, 0x75, 0x6a, 0x11, 0xdb, 0xe5, 0x7a, 0x89, 0x85, 0xa6, + 0xab, 0x8b, 0x65, 0x18, 0x4c, 0xfb, 0x4c, 0x81, 0x73, 0x0f, 0x3d, 0x73, 0x5b, 0xd8, 0xb1, 0x0e, + 0x74, 0x0f, 0x7f, 0x9f, 0xbd, 0x7f, 0x58, 0x25, 0x14, 0x67, 0xf0, 0x7e, 0x15, 0xbb, 0x14, 0x25, + 0x60, 0x60, 0xbf, 0xaa, 0xdb, 0xd4, 0xa2, 0x87, 0xaa, 0x32, 0xab, 0x2c, 0x0d, 0x66, 0x6a, 0xcf, + 0xe8, 0x5f, 0x30, 0x58, 0xd6, 0x9d, 0x3d, 0x4c, 0xb3, 0x96, 0xa9, 0x76, 0xf1, 0x97, 0x5c, 0xb0, + 0x63, 0xa2, 0x69, 0xe8, 0xb3, 0xdc, 0x5d, 0x62, 0x17, 0xd4, 0xee, 0x59, 0x65, 0x69, 0x20, 0x23, + 0x9e, 0xd0, 0x1c, 0x8c, 0x94, 0xf5, 0x3d, 0xec, 0x64, 0x75, 0xd3, 0x74, 0xb0, 0xeb, 0xaa, 0x3d, + 0x4c, 0x71, 0x98, 0x09, 0x6f, 0x71, 0x99, 0x96, 0x03, 0xad, 0x15, 0x35, 0xb7, 0x42, 0x6c, 0x17, + 0xa3, 0x9b, 0xd0, 0xb7, 0xef, 0x09, 0x5c, 0x55, 0x99, 0xed, 0x5e, 0x1a, 0x5a, 0x9f, 0x4f, 0x35, + 0x8b, 0x58, 0x8a, 0xa9, 0x73, 0x6d, 0xa1, 0xa3, 0x7d, 0xa7, 0xc0, 0x2c, 0x33, 0xf2, 0xa8, 0x9a, + 0xd3, 0x0d, 0x83, 0x54, 0x6d, 0x7a, 0x4f, 0x77, 0x0a, 0x96, 0x7d, 0x97, 0x94, 0x4c, 0xe9, 0x7e, + 0x88, 0xad, 0x12, 0x66, 0xeb, 0xc5, 0x81, 0x32, 0x50, 0x1e, 0x63, 0x19, 0x07, 0x26, 0xd8, 0xc6, + 0xd8, 0x5b, 0x21, 0xa7, 0xbb, 0x38, 0x6b, 0x54, 0x1d, 0x07, 0xdb, 0xc6, 0x21, 0x0b, 0xc7, 0x60, + 0x66, 0xd8, 0x13, 0xfe, 0x5f, 0xc8, 0xd0, 0x3c, 0x8c, 0xba, 0x35, 0x16, 0x59, 0x2b, 0x6b, 0xca, + 0xa8, 0xf8, 0xd2, 0x9d, 0x2d, 0x6d, 0x4b, 0x24, 0x2c, 0x9a, 0xb0, 0x08, 0xca, 0x0c, 0x0c, 0x95, + 0x99, 0x34, 0x5b, 0x24, 0x25, 0x53, 0xf0, 0x85, 0x72, 0x0d, 0xa8, 0xfd, 0x17, 0x66, 0xa2, 0x62, + 0x9b, 0x23, 0x64, 0x4f, 0x7a, 0x5d, 0x97, 0x58, 0xa5, 0x3e, 0xb1, 0xda, 0xe7, 0x32, 0x6e, 0x91, + 0x0b, 0xf8, 0xa9, 0x71, 0x8b, 0xc4, 0xa1, 0x31, 0x52, 0xf3, 0xc0, 0xb1, 0x0c, 0xbc, 0x8b, 0x0f, + 0x70, 0x29, 0x23, 0x74, 0xd0, 0x06, 0xf4, 0x96, 0x88, 0x5d, 0x70, 0xd5, 0xae, 0x0e, 0x94, 0xb9, + 0x8a, 0x76, 0xa4, 0xc0, 0x34, 0xa3, 0xc7, 0x63, 0xb3, 0x63, 0xe7, 0xc9, 0xdb, 0x4b, 0x66, 0x38, + 0x4f, 0xdd, 0xe1, 0x3c, 0x85, 0x53, 0xde, 0x13, 0x91, 0xf2, 0x0b, 0x30, 0x8e, 0x9f, 0x19, 0x45, + 0xdd, 0x2e, 0xe0, 0x1a, 0x9f, 0x5e, 0x86, 0x1b, 0x93, 0x72, 0x79, 0x1a, 0x3e, 0x84, 0x53, 0x21, + 0x8f, 0x44, 0x9c, 0x6f, 0xd7, 0xb2, 0x6d, 0xd9, 0x79, 0xc2, 0x1c, 0x6a, 0x19, 0xaf, 0xc0, 0x12, + 0x62, 0x4f, 0x78, 0xbf, 0xb5, 0x19, 0x38, 0xdb, 0x90, 0xd2, 0x7b, 0x2c, 0xdd, 0xae, 0x08, 0x9d, + 0x96, 0x87, 0x64, 0x33, 0x80, 0x60, 0xb2, 0x05, 0xfd, 0x7c, 0x8b, 0xc8, 0x94, 0x5f, 0x6c, 0xce, + 0xa2, 0x71, 0x95, 0x8c, 0x54, 0xd5, 0xaa, 0x30, 0xc1, 0xec, 0xb0, 0x1d, 0x25, 0xf3, 0x76, 0x16, + 0x80, 0x2d, 0x90, 0x2d, 0xea, 0x6e, 0x51, 0x24, 0x6d, 0x90, 0x49, 0xee, 0xea, 0x6e, 0xb1, 0x75, + 0x19, 0x8a, 0x95, 0x31, 0xed, 0x3d, 0x40, 0x41, 0xb3, 0xc2, 0xa5, 0x2b, 0xd0, 0xcb, 0xac, 0x88, + 0xb0, 0xce, 0xb4, 0x29, 0x2f, 0x19, 0x8e, 0xd6, 0x3e, 0x12, 0xe9, 0xba, 0x65, 0xd4, 0xce, 0xc6, + 0xbb, 0xf3, 0xe4, 0x21, 0xa8, 0x61, 0xe3, 0xc7, 0xf3, 0xe7, 0x63, 0xb9, 0xa4, 0x63, 0x14, 0xdf, + 0xbd, 0x43, 0x19, 0x38, 0x1d, 0x61, 0xfd, 0x78, 0x1e, 0x7d, 0x3a, 0x00, 0xc3, 0x4c, 0xb0, 0x6d, + 0x95, 0x28, 0x76, 0x5c, 0xb4, 0x0a, 0x53, 0x06, 0xb1, 0xa9, 0xa3, 0x1b, 0x34, 0x5b, 0xf1, 0x4a, + 0x4a, 0x36, 0x47, 0xaa, 0xb6, 0xac, 0x7d, 0x48, 0xbe, 0x63, 0xd5, 0x66, 0xd3, 0x7b, 0xd3, 0xda, + 0xb3, 0x53, 0xd0, 0x6f, 0xb9, 0xd9, 0x52, 0xb8, 0xf9, 0xcd, 0xc0, 0x90, 0x4d, 0x68, 0x16, 0x3f, + 0xab, 0x58, 0x0e, 0xe6, 0x45, 0x7e, 0x20, 0x03, 0x36, 0xa1, 0xb7, 0xb9, 0x04, 0xa5, 0x60, 0x52, + 0x94, 0x28, 0xd7, 0xc5, 0xb4, 0xa1, 0x30, 0x4c, 0xf0, 0x42, 0xe5, 0xbd, 0x91, 0xd5, 0x2a, 0x05, + 0x93, 0x34, 0x02, 0xdf, 0xc7, 0xf1, 0x34, 0x84, 0x8f, 0xaa, 0x3a, 0xfd, 0x91, 0x55, 0x07, 0x2d, + 0xc0, 0xa8, 0x8b, 0x6d, 0x33, 0x50, 0x2e, 0x07, 0x18, 0x70, 0x84, 0x4b, 0x25, 0x6c, 0x09, 0xc6, + 0x83, 0x8c, 0x4d, 0x9d, 0xea, 0xea, 0x20, 0x03, 0x8e, 0xfa, 0x74, 0xb7, 0x74, 0xaa, 0x7b, 0x48, + 0xda, 0x88, 0x04, 0x8e, 0xa4, 0xf5, 0xc8, 0x65, 0x40, 0x75, 0x51, 0x28, 0x7b, 0x7b, 0x41, 0x1d, + 0x62, 0xd8, 0xf1, 0x40, 0x10, 0x98, 0xdc, 0x43, 0xd3, 0x30, 0x7a, 0x98, 0xa3, 0x69, 0x23, 0x3a, + 0xd4, 0x04, 0x46, 0x22, 0x9a, 0xc0, 0x45, 0x98, 0xf0, 0xf2, 0x54, 0x0f, 0x1c, 0xe5, 0x71, 0xb2, + 0x09, 0xbd, 0x17, 0xc4, 0xce, 0xc1, 0x08, 0xad, 0xc3, 0x8d, 0xf1, 0x05, 0x69, 0x10, 0xb4, 0x00, + 0xa3, 0xd4, 0xd1, 0x83, 0xc1, 0x1c, 0xe7, 0xc1, 0xe4, 0x52, 0x09, 0x5b, 0x87, 0x93, 0x79, 0x8c, + 0xb3, 0x0e, 0x36, 0xac, 0x8a, 0x85, 0x6d, 0x3f, 0xa1, 0x13, 0x0c, 0x3d, 0x99, 0xc7, 0x38, 0x23, + 0xdf, 0x49, 0x9d, 0x34, 0x4c, 0x95, 0x65, 0xc3, 0x0a, 0x86, 0x16, 0x05, 0xf6, 0xcc, 0x36, 0xc6, + 0x7e, 0x74, 0xd3, 0x30, 0x45, 0xa3, 0x14, 0x26, 0x03, 0x9b, 0xa6, 0x4e, 0xe1, 0x02, 0x8c, 0x07, + 0x0e, 0xaa, 0x4d, 0x6c, 0x03, 0xab, 0x53, 0x3c, 0x18, 0xbe, 0xfc, 0x7d, 0x4f, 0x8c, 0xce, 0xc0, + 0xa0, 0x69, 0x39, 0xde, 0x11, 0x24, 0xb6, 0x7a, 0x92, 0x97, 0x83, 0x9a, 0x00, 0xcd, 0xc1, 0x28, + 0x3f, 0x5d, 0x25, 0x9a, 0x25, 0x4e, 0x16, 0xef, 0xab, 0xd3, 0x0c, 0x32, 0xc4, 0xa4, 0xbb, 0xf4, + 0xbe, 0x73, 0x7b, 0xdf, 0x07, 0x15, 0x24, 0xe8, 0x54, 0x00, 0x74, 0x87, 0x83, 0x66, 0x60, 0xc8, + 0xb2, 0x4d, 0xfc, 0x8c, 0x9f, 0x56, 0x55, 0xe5, 0x53, 0x0e, 0x13, 0xb1, 0x43, 0x1a, 0x51, 0x5c, + 0x4e, 0x47, 0x14, 0x97, 0x5f, 0x14, 0x38, 0x13, 0x39, 0x68, 0xca, 0xfa, 0xf6, 0x3f, 0xe8, 0xcf, + 0xf3, 0x1a, 0x21, 0x4a, 0xcc, 0x62, 0x9b, 0x12, 0x23, 0x2a, 0x4a, 0x46, 0xaa, 0x79, 0x73, 0xb0, + 0x4b, 0x75, 0x5a, 0x75, 0x45, 0x95, 0x10, 0x4f, 0x28, 0x09, 0x60, 0x90, 0x52, 0x49, 0x84, 0x8a, + 0x57, 0xbe, 0x80, 0x04, 0x2d, 0xc2, 0x18, 0xdb, 0x1b, 0xd9, 0x8a, 0x6e, 0x89, 0xf2, 0xda, 0x13, + 0xd8, 0x32, 0x0f, 0x74, 0x8b, 0x95, 0x58, 0xed, 0x07, 0x05, 0x96, 0xc3, 0x53, 0xe1, 0x1e, 0xa6, + 0xcd, 0x5c, 0x6a, 0x35, 0xdc, 0x85, 0x4f, 0x47, 0x57, 0xbb, 0x11, 0xa9, 0xbb, 0xed, 0x88, 0x14, + 0x35, 0xca, 0xfe, 0x24, 0xa7, 0xb4, 0x47, 0x15, 0x42, 0xff, 0x69, 0x21, 0x7f, 0x2c, 0x1a, 0x7c, + 0x90, 0xbb, 0x68, 0x48, 0xd7, 0xa1, 0xdf, 0xc1, 0x06, 0x71, 0x4c, 0x39, 0x05, 0xb5, 0x6d, 0x49, + 0x12, 0xaf, 0xbd, 0x50, 0xe0, 0x24, 0x5b, 0xf6, 0xb1, 0x34, 0x26, 0x23, 0x82, 0xa0, 0xc7, 0xd6, + 0xcb, 0x58, 0x24, 0x8b, 0xfd, 0xf6, 0x64, 0x8c, 0x20, 0xf7, 0x90, 0xfd, 0x8e, 0x2c, 0xc5, 0xdd, + 0xb1, 0x4b, 0x71, 0x4f, 0x54, 0x29, 0xd6, 0xbe, 0x95, 0x89, 0x0a, 0xb0, 0x12, 0xbe, 0x46, 0xd1, + 0x8a, 0xa2, 0xd0, 0x15, 0x9b, 0x42, 0x77, 0x64, 0x37, 0x90, 0xae, 0xf6, 0x04, 0x5c, 0x55, 0xa1, + 0x1f, 0xdb, 0x7a, 0xae, 0x84, 0x4d, 0xd6, 0x1b, 0x07, 0x32, 0xf2, 0x51, 0x7b, 0x14, 0x3a, 0xd1, + 0x62, 0xc6, 0x8c, 0xb3, 0xfd, 0xa7, 0xa1, 0x8f, 0x5a, 0xc6, 0x1e, 0x76, 0xe4, 0xce, 0xe1, 0x4f, + 0x9a, 0xd1, 0x64, 0x3e, 0xae, 0xc5, 0x62, 0x13, 0xfa, 0xf8, 0x22, 0x62, 0xcf, 0x76, 0x32, 0xfc, + 0x0a, 0x4d, 0x4d, 0x6d, 0x8c, 0x74, 0x6d, 0xfa, 0xfe, 0x40, 0x6c, 0xb8, 0xe0, 0x1b, 0x61, 0xf8, + 0x3f, 0x8d, 0x1b, 0x6e, 0xae, 0xb9, 0x65, 0x3f, 0x85, 0xb5, 0x4d, 0xf7, 0x24, 0xe4, 0xd8, 0xdb, + 0xdb, 0xd0, 0x4f, 0x61, 0x25, 0x66, 0x61, 0x3a, 0xb6, 0xad, 0xf5, 0xaf, 0xa6, 0xa0, 0x97, 0x19, + 0x43, 0xcf, 0x15, 0x00, 0x7f, 0x96, 0x47, 0x97, 0x9a, 0x2f, 0x11, 0xfa, 0xd0, 0x48, 0x2c, 0xc7, + 0x03, 0x73, 0xba, 0xda, 0xf9, 0x4f, 0x7e, 0xfb, 0xf3, 0x45, 0xd7, 0x39, 0x34, 0x93, 0x6e, 0x7d, + 0xe1, 0x82, 0xbe, 0x56, 0x60, 0xbc, 0x71, 0x28, 0x47, 0x6b, 0x6d, 0x6c, 0x85, 0xbf, 0x1e, 0x12, + 0xeb, 0x9d, 0xa8, 0x08, 0x92, 0x2b, 0x8c, 0xe4, 0x79, 0xb4, 0xd0, 0x9c, 0xa4, 0x1e, 0x60, 0xf5, + 0x8d, 0x22, 0x3e, 0xc0, 0x82, 0xe3, 0x36, 0x6a, 0x6b, 0x38, 0xfc, 0x65, 0x90, 0xb8, 0xdc, 0x91, + 0x8e, 0x60, 0x9b, 0x62, 0x6c, 0x97, 0xd0, 0x62, 0x0b, 0xb6, 0x41, 0x62, 0x5f, 0x2a, 0x30, 0xd6, + 0x50, 0x8a, 0xd1, 0x6a, 0x1b, 0xc3, 0xa1, 0x8e, 0x93, 0x58, 0xeb, 0x40, 0x43, 0x10, 0x5d, 0x66, + 0x44, 0x17, 0xd1, 0x7c, 0x73, 0xa2, 0xae, 0x4f, 0xe9, 0x0b, 0x05, 0x46, 0xeb, 0x0f, 0x30, 0x4a, + 0xb7, 0xb1, 0xd9, 0xd8, 0x04, 0x12, 0xab, 0xf1, 0x15, 0x04, 0xc7, 0x4b, 0x8c, 0xe3, 0x02, 0x9a, + 0x6b, 0xce, 0xb1, 0xd6, 0xd7, 0xfc, 0x48, 0xfa, 0x35, 0x06, 0xc5, 0x36, 0x19, 0x3b, 0x92, 0xe1, + 0x02, 0x16, 0x27, 0x92, 0xd4, 0xa7, 0xf4, 0xbd, 0x6c, 0x92, 0x8d, 0x55, 0x14, 0x5d, 0x6d, 0x63, + 0xba, 0x49, 0x3f, 0x48, 0x5c, 0xeb, 0x58, 0x4f, 0x10, 0x5f, 0x62, 0xc4, 0x35, 0x34, 0xdb, 0x9c, + 0x38, 0x2f, 0xec, 0xe8, 0x47, 0xd9, 0x43, 0x43, 0xb7, 0x27, 0xa8, 0x53, 0xeb, 0xb5, 0x48, 0xff, + 0xbb, 0x73, 0x45, 0xc1, 0xfb, 0x02, 0xe3, 0x3d, 0x87, 0xce, 0xb5, 0xe3, 0xed, 0xa2, 0x9f, 0xc3, + 0xd1, 0x16, 0x3b, 0x3a, 0x7e, 0xb4, 0xeb, 0x8f, 0xda, 0xb5, 0x8e, 0xf5, 0x04, 0xeb, 0x75, 0xc6, + 0x7a, 0x19, 0x5d, 0x6c, 0xce, 0xda, 0x6c, 0x24, 0xf9, 0x97, 0x02, 0x0b, 0xb1, 0x3a, 0x10, 0xda, + 0x6e, 0x57, 0x01, 0xe2, 0xcd, 0xd6, 0x89, 0x3b, 0xc7, 0x5e, 0x47, 0xb8, 0xbb, 0xc9, 0xdc, 0xbd, + 0x89, 0x36, 0x5a, 0xd4, 0x97, 0x76, 0x4e, 0x1d, 0x29, 0x90, 0x68, 0x7e, 0x8b, 0x8e, 0x6e, 0x74, + 0x98, 0x8a, 0xe0, 0xdf, 0x02, 0x89, 0x9b, 0x6f, 0xa6, 0x2c, 0xbc, 0xbb, 0xc6, 0xbc, 0x5b, 0x43, + 0xe9, 0xf8, 0xc9, 0xe4, 0x9c, 0x7f, 0x55, 0xc4, 0x6d, 0x50, 0xd4, 0x15, 0x38, 0xda, 0xe8, 0x24, + 0xfa, 0xf5, 0x17, 0xfd, 0x89, 0x1b, 0x6f, 0xa4, 0x2b, 0xfc, 0xb9, 0xca, 0xfc, 0x59, 0x45, 0xa9, + 0x98, 0xd9, 0x92, 0x84, 0x5f, 0x2a, 0xe2, 0x6a, 0x2d, 0xe2, 0x2a, 0x1d, 0x5d, 0xef, 0x2c, 0xc4, + 0x81, 0xfb, 0xfb, 0xc4, 0xc6, 0x9b, 0xa8, 0x0a, 0x5f, 0xae, 0x30, 0x5f, 0xd2, 0x68, 0x25, 0x76, + 0x6e, 0x18, 0xdb, 0x5a, 0xff, 0xf0, 0x6f, 0x98, 0xdb, 0xf6, 0x8f, 0xd0, 0x0d, 0x7d, 0xdb, 0xfe, + 0x11, 0xbe, 0x01, 0x8f, 0xd3, 0x3f, 0xfc, 0x8b, 0xee, 0xcd, 0xfc, 0xcb, 0x57, 0x49, 0xe5, 0xe8, + 0x55, 0x52, 0xf9, 0xe3, 0x55, 0x52, 0x79, 0xfe, 0x3a, 0x79, 0xe2, 0xe8, 0x75, 0xf2, 0xc4, 0xef, + 0xaf, 0x93, 0x27, 0x9e, 0xec, 0x16, 0x2c, 0x5a, 0xac, 0xe6, 0x52, 0x06, 0x29, 0xa7, 0x77, 0xe4, + 0x4a, 0xbb, 0x7a, 0xce, 0xf5, 0xd7, 0x5d, 0x31, 0x88, 0x83, 0x83, 0x8f, 0x45, 0xdd, 0xb2, 0xd3, + 0x65, 0x62, 0x56, 0x4b, 0xd8, 0x95, 0x46, 0xe9, 0x61, 0x05, 0xbb, 0xb9, 0x3e, 0xf6, 0x1f, 0xdb, + 0xe5, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x06, 0xd1, 0x86, 0xea, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2484,23 +2061,17 @@ type QueryClient interface { QueryDerivativeMarkets(ctx context.Context, in *QueryDerivativeMarketsRequest, opts ...grpc.CallOption) (*QueryDerivativeMarketsResponse, error) // Retrieves a list of derivative orders matching the filtering rules. QueryDerivativeOrders(ctx context.Context, in *QueryDerivativeOrdersRequest, opts ...grpc.CallOption) (*QueryDerivativeOrdersResponse, error) - // Retrieves a list of derivative orders for a provided subaccount and marketID. + // Retrieves a list of derivative orders for a provided subaccount and + // marketID. QuerySubaccountMarketDerivativeOrders(ctx context.Context, in *QuerySubaccountMarketDerivativeOrdersRequest, opts ...grpc.CallOption) (*QuerySubaccountMarketDerivativeOrdersResponse, error) - // Retrieves a list of derivative orders matching the filtering rules. - QueryZeroExTransaction(ctx context.Context, in *QueryZeroExTransactionRequest, opts ...grpc.CallOption) (*QueryZeroExTransactionResponse, error) - // Query whether a set of orders have been soft-cancelled. The response - // returns the subset of orders that have been soft-cancelled. - QuerySoftCancelledOrders(ctx context.Context, in *QuerySoftCancelledOrdersRequest, opts ...grpc.CallOption) (*QuerySoftCancelledOrdersResponse, error) - // Retrieves a list of fill requests matching the filtering rules. - QueryOutstandingFillRequests(ctx context.Context, in *QueryOutstandingFillRequestsRequest, opts ...grpc.CallOption) (*QueryOutstandingFillRequestsResponse, error) - // Retrieves a list of fill requests matching the filtering rules. - QueryFillRequests(ctx context.Context, in *QueryFillRequestsRequest, opts ...grpc.CallOption) (*QueryFillRequestsResponse, error) // Retrieves a list of orders matching a given market, direction and quantity QueryDerivativeOrdersQuote(ctx context.Context, in *QueryDerivativeOrdersQuoteRequest, opts ...grpc.CallOption) (*QueryDerivativeOrdersQuoteResponse, error) // Retrieves a list of orders matching a given market, direction and quantity QuerySubaccountMarginHold(ctx context.Context, in *QuerySubaccountMarginHoldRequest, opts ...grpc.CallOption) (*QuerySubaccountMarginHoldResponse, error) // Retrieves a derivative market orderbook QueryDerivativeOrderbook(ctx context.Context, in *QueryDerivativeOrderbookRequest, opts ...grpc.CallOption) (*QueryDerivativeOrderbookResponse, error) + // Retrieves a subaccount's margin info for a given base currency + QueryMarginInfo(ctx context.Context, in *QueryMarginInfoRequest, opts ...grpc.CallOption) (*QueryMarginInfoResponse, error) } type queryClient struct { @@ -2601,63 +2172,36 @@ func (c *queryClient) QuerySubaccountMarketDerivativeOrders(ctx context.Context, return out, nil } -func (c *queryClient) QueryZeroExTransaction(ctx context.Context, in *QueryZeroExTransactionRequest, opts ...grpc.CallOption) (*QueryZeroExTransactionResponse, error) { - out := new(QueryZeroExTransactionResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryZeroExTransaction", in, out, opts...) +func (c *queryClient) QueryDerivativeOrdersQuote(ctx context.Context, in *QueryDerivativeOrdersQuoteRequest, opts ...grpc.CallOption) (*QueryDerivativeOrdersQuoteResponse, error) { + out := new(QueryDerivativeOrdersQuoteResponse) + err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryDerivativeOrdersQuote", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) QuerySoftCancelledOrders(ctx context.Context, in *QuerySoftCancelledOrdersRequest, opts ...grpc.CallOption) (*QuerySoftCancelledOrdersResponse, error) { - out := new(QuerySoftCancelledOrdersResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QuerySoftCancelledOrders", in, out, opts...) +func (c *queryClient) QuerySubaccountMarginHold(ctx context.Context, in *QuerySubaccountMarginHoldRequest, opts ...grpc.CallOption) (*QuerySubaccountMarginHoldResponse, error) { + out := new(QuerySubaccountMarginHoldResponse) + err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QuerySubaccountMarginHold", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) QueryOutstandingFillRequests(ctx context.Context, in *QueryOutstandingFillRequestsRequest, opts ...grpc.CallOption) (*QueryOutstandingFillRequestsResponse, error) { - out := new(QueryOutstandingFillRequestsResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryOutstandingFillRequests", in, out, opts...) +func (c *queryClient) QueryDerivativeOrderbook(ctx context.Context, in *QueryDerivativeOrderbookRequest, opts ...grpc.CallOption) (*QueryDerivativeOrderbookResponse, error) { + out := new(QueryDerivativeOrderbookResponse) + err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryDerivativeOrderbook", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) QueryFillRequests(ctx context.Context, in *QueryFillRequestsRequest, opts ...grpc.CallOption) (*QueryFillRequestsResponse, error) { - out := new(QueryFillRequestsResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryFillRequests", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) QueryDerivativeOrdersQuote(ctx context.Context, in *QueryDerivativeOrdersQuoteRequest, opts ...grpc.CallOption) (*QueryDerivativeOrdersQuoteResponse, error) { - out := new(QueryDerivativeOrdersQuoteResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryDerivativeOrdersQuote", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) QuerySubaccountMarginHold(ctx context.Context, in *QuerySubaccountMarginHoldRequest, opts ...grpc.CallOption) (*QuerySubaccountMarginHoldResponse, error) { - out := new(QuerySubaccountMarginHoldResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QuerySubaccountMarginHold", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *queryClient) QueryDerivativeOrderbook(ctx context.Context, in *QueryDerivativeOrderbookRequest, opts ...grpc.CallOption) (*QueryDerivativeOrderbookResponse, error) { - out := new(QueryDerivativeOrderbookResponse) - err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryDerivativeOrderbook", in, out, opts...) +func (c *queryClient) QueryMarginInfo(ctx context.Context, in *QueryMarginInfoRequest, opts ...grpc.CallOption) (*QueryMarginInfoResponse, error) { + out := new(QueryMarginInfoResponse) + err := c.cc.Invoke(ctx, "/injective.orders.v1beta1.Query/QueryMarginInfo", in, out, opts...) if err != nil { return nil, err } @@ -2684,23 +2228,17 @@ type QueryServer interface { QueryDerivativeMarkets(context.Context, *QueryDerivativeMarketsRequest) (*QueryDerivativeMarketsResponse, error) // Retrieves a list of derivative orders matching the filtering rules. QueryDerivativeOrders(context.Context, *QueryDerivativeOrdersRequest) (*QueryDerivativeOrdersResponse, error) - // Retrieves a list of derivative orders for a provided subaccount and marketID. + // Retrieves a list of derivative orders for a provided subaccount and + // marketID. QuerySubaccountMarketDerivativeOrders(context.Context, *QuerySubaccountMarketDerivativeOrdersRequest) (*QuerySubaccountMarketDerivativeOrdersResponse, error) - // Retrieves a list of derivative orders matching the filtering rules. - QueryZeroExTransaction(context.Context, *QueryZeroExTransactionRequest) (*QueryZeroExTransactionResponse, error) - // Query whether a set of orders have been soft-cancelled. The response - // returns the subset of orders that have been soft-cancelled. - QuerySoftCancelledOrders(context.Context, *QuerySoftCancelledOrdersRequest) (*QuerySoftCancelledOrdersResponse, error) - // Retrieves a list of fill requests matching the filtering rules. - QueryOutstandingFillRequests(context.Context, *QueryOutstandingFillRequestsRequest) (*QueryOutstandingFillRequestsResponse, error) - // Retrieves a list of fill requests matching the filtering rules. - QueryFillRequests(context.Context, *QueryFillRequestsRequest) (*QueryFillRequestsResponse, error) // Retrieves a list of orders matching a given market, direction and quantity QueryDerivativeOrdersQuote(context.Context, *QueryDerivativeOrdersQuoteRequest) (*QueryDerivativeOrdersQuoteResponse, error) // Retrieves a list of orders matching a given market, direction and quantity QuerySubaccountMarginHold(context.Context, *QuerySubaccountMarginHoldRequest) (*QuerySubaccountMarginHoldResponse, error) // Retrieves a derivative market orderbook QueryDerivativeOrderbook(context.Context, *QueryDerivativeOrderbookRequest) (*QueryDerivativeOrderbookResponse, error) + // Retrieves a subaccount's margin info for a given base currency + QueryMarginInfo(context.Context, *QueryMarginInfoRequest) (*QueryMarginInfoResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -2737,18 +2275,6 @@ func (*UnimplementedQueryServer) QueryDerivativeOrders(ctx context.Context, req func (*UnimplementedQueryServer) QuerySubaccountMarketDerivativeOrders(ctx context.Context, req *QuerySubaccountMarketDerivativeOrdersRequest) (*QuerySubaccountMarketDerivativeOrdersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QuerySubaccountMarketDerivativeOrders not implemented") } -func (*UnimplementedQueryServer) QueryZeroExTransaction(ctx context.Context, req *QueryZeroExTransactionRequest) (*QueryZeroExTransactionResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method QueryZeroExTransaction not implemented") -} -func (*UnimplementedQueryServer) QuerySoftCancelledOrders(ctx context.Context, req *QuerySoftCancelledOrdersRequest) (*QuerySoftCancelledOrdersResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method QuerySoftCancelledOrders not implemented") -} -func (*UnimplementedQueryServer) QueryOutstandingFillRequests(ctx context.Context, req *QueryOutstandingFillRequestsRequest) (*QueryOutstandingFillRequestsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method QueryOutstandingFillRequests not implemented") -} -func (*UnimplementedQueryServer) QueryFillRequests(ctx context.Context, req *QueryFillRequestsRequest) (*QueryFillRequestsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method QueryFillRequests not implemented") -} func (*UnimplementedQueryServer) QueryDerivativeOrdersQuote(ctx context.Context, req *QueryDerivativeOrdersQuoteRequest) (*QueryDerivativeOrdersQuoteResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryDerivativeOrdersQuote not implemented") } @@ -2758,6 +2284,9 @@ func (*UnimplementedQueryServer) QuerySubaccountMarginHold(ctx context.Context, func (*UnimplementedQueryServer) QueryDerivativeOrderbook(ctx context.Context, req *QueryDerivativeOrderbookRequest) (*QueryDerivativeOrderbookResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryDerivativeOrderbook not implemented") } +func (*UnimplementedQueryServer) QueryMarginInfo(ctx context.Context, req *QueryMarginInfoRequest) (*QueryMarginInfoResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryMarginInfo not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -2943,78 +2472,6 @@ func _Query_QuerySubaccountMarketDerivativeOrders_Handler(srv interface{}, ctx c return interceptor(ctx, in, info, handler) } -func _Query_QueryZeroExTransaction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryZeroExTransactionRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).QueryZeroExTransaction(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/injective.orders.v1beta1.Query/QueryZeroExTransaction", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryZeroExTransaction(ctx, req.(*QueryZeroExTransactionRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_QuerySoftCancelledOrders_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QuerySoftCancelledOrdersRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).QuerySoftCancelledOrders(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/injective.orders.v1beta1.Query/QuerySoftCancelledOrders", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QuerySoftCancelledOrders(ctx, req.(*QuerySoftCancelledOrdersRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_QueryOutstandingFillRequests_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryOutstandingFillRequestsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).QueryOutstandingFillRequests(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/injective.orders.v1beta1.Query/QueryOutstandingFillRequests", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryOutstandingFillRequests(ctx, req.(*QueryOutstandingFillRequestsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Query_QueryFillRequests_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryFillRequestsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).QueryFillRequests(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/injective.orders.v1beta1.Query/QueryFillRequests", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).QueryFillRequests(ctx, req.(*QueryFillRequestsRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Query_QueryDerivativeOrdersQuote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryDerivativeOrdersQuoteRequest) if err := dec(in); err != nil { @@ -3069,6 +2526,24 @@ func _Query_QueryDerivativeOrderbook_Handler(srv interface{}, ctx context.Contex return interceptor(ctx, in, info, handler) } +func _Query_QueryMarginInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryMarginInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QueryMarginInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/injective.orders.v1beta1.Query/QueryMarginInfo", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QueryMarginInfo(ctx, req.(*QueryMarginInfoRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "injective.orders.v1beta1.Query", HandlerType: (*QueryServer)(nil), @@ -3113,22 +2588,6 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QuerySubaccountMarketDerivativeOrders", Handler: _Query_QuerySubaccountMarketDerivativeOrders_Handler, }, - { - MethodName: "QueryZeroExTransaction", - Handler: _Query_QueryZeroExTransaction_Handler, - }, - { - MethodName: "QuerySoftCancelledOrders", - Handler: _Query_QuerySoftCancelledOrders_Handler, - }, - { - MethodName: "QueryOutstandingFillRequests", - Handler: _Query_QueryOutstandingFillRequests_Handler, - }, - { - MethodName: "QueryFillRequests", - Handler: _Query_QueryFillRequests_Handler, - }, { MethodName: "QueryDerivativeOrdersQuote", Handler: _Query_QueryDerivativeOrdersQuote_Handler, @@ -3141,6 +2600,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QueryDerivativeOrderbook", Handler: _Query_QueryDerivativeOrderbook_Handler, }, + { + MethodName: "QueryMarginInfo", + Handler: _Query_QueryMarginInfo_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "injective/orders/v1beta1/query.proto", @@ -3399,7 +2862,7 @@ func (m *QueryDerivativeOrderbookResponse) MarshalToSizedBuffer(dAtA []byte) (in return len(dAtA) - i, nil } -func (m *QueryDerivativeMarketsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryMarginInfoRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3409,20 +2872,55 @@ func (m *QueryDerivativeMarketsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryDerivativeMarketsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryMarginInfoRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryDerivativeMarketsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryMarginInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l + if len(m.ExchangeAddress) > 0 { + i -= len(m.ExchangeAddress) + copy(dAtA[i:], m.ExchangeAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ExchangeAddress))) + i-- + dAtA[i] = 0x2a + } + if len(m.BaseCurrency) > 0 { + i -= len(m.BaseCurrency) + copy(dAtA[i:], m.BaseCurrency) + i = encodeVarintQuery(dAtA, i, uint64(len(m.BaseCurrency))) + i-- + dAtA[i] = 0x22 + } + if len(m.SubaccountID) > 0 { + i -= len(m.SubaccountID) + copy(dAtA[i:], m.SubaccountID) + i = encodeVarintQuery(dAtA, i, uint64(len(m.SubaccountID))) + i-- + dAtA[i] = 0x1a + } + if len(m.TakerFee) > 0 { + i -= len(m.TakerFee) + copy(dAtA[i:], m.TakerFee) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TakerFee))) + i-- + dAtA[i] = 0x12 + } + if len(m.MakerAddress) > 0 { + i -= len(m.MakerAddress) + copy(dAtA[i:], m.MakerAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.MakerAddress))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } -func (m *QueryDerivativeMarketsResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryMarginInfoResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3432,34 +2930,32 @@ func (m *QueryDerivativeMarketsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryDerivativeMarketsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryMarginInfoResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryDerivativeMarketsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryMarginInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Markets) > 0 { - for iNdEx := len(m.Markets) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Markets[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + if m.MarginInfo != nil { + { + size, err := m.MarginInfo.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 } -func (m *QuerySoftCancelledOrdersRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryDerivativeMarketsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3469,34 +2965,20 @@ func (m *QuerySoftCancelledOrdersRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QuerySoftCancelledOrdersRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryDerivativeMarketsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QuerySoftCancelledOrdersRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryDerivativeMarketsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.ChainId != 0 { - i = encodeVarintQuery(dAtA, i, uint64((uint64(m.ChainId)<<1)^uint64((m.ChainId>>63)))) - i-- - dAtA[i] = 0x10 - } - if len(m.OrderHashes) > 0 { - for iNdEx := len(m.OrderHashes) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.OrderHashes[iNdEx]) - copy(dAtA[i:], m.OrderHashes[iNdEx]) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHashes[iNdEx]))) - i-- - dAtA[i] = 0xa - } - } return len(dAtA) - i, nil } -func (m *QuerySoftCancelledOrdersResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryDerivativeMarketsResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3506,21 +2988,26 @@ func (m *QuerySoftCancelledOrdersResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QuerySoftCancelledOrdersResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryDerivativeMarketsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QuerySoftCancelledOrdersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryDerivativeMarketsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.OrderHashes) > 0 { - for iNdEx := len(m.OrderHashes) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.OrderHashes[iNdEx]) - copy(dAtA[i:], m.OrderHashes[iNdEx]) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHashes[iNdEx]))) + if len(m.Markets) > 0 { + for iNdEx := len(m.Markets) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Markets[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0xa } @@ -3686,7 +3173,7 @@ func (m *QueryActiveOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *QueryZeroExTransactionRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryArchiveOrderRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3696,27 +3183,41 @@ func (m *QueryZeroExTransactionRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryZeroExTransactionRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryArchiveOrderRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryZeroExTransactionRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryArchiveOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TxHash))) + if len(m.SubaccountID) > 0 { + i -= len(m.SubaccountID) + copy(dAtA[i:], m.SubaccountID) + i = encodeVarintQuery(dAtA, i, uint64(len(m.SubaccountID))) + i-- + dAtA[i] = 0x1a + } + if len(m.MarketId) > 0 { + i -= len(m.MarketId) + copy(dAtA[i:], m.MarketId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.MarketId))) + i-- + dAtA[i] = 0x12 + } + if len(m.OrderHash) > 0 { + i -= len(m.OrderHash) + copy(dAtA[i:], m.OrderHash) + i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHash))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryZeroExTransactionResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryArchiveOrderResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3726,53 +3227,32 @@ func (m *QueryZeroExTransactionResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryZeroExTransactionResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryArchiveOrderResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryZeroExTransactionResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryArchiveOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.SoftCancelRequests) > 0 { - for iNdEx := len(m.SoftCancelRequests) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.SoftCancelRequests[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if len(m.FillRequests) > 0 { - for iNdEx := len(m.FillRequests) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FillRequests[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + if m.Order != nil { + { + size, err := m.Order.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x12 + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } - } - if m.TxType != 0 { - i = encodeVarintQuery(dAtA, i, uint64((uint64(m.TxType)<<1)^uint64((m.TxType>>63)))) i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryArchiveOrderRequest) Marshal() (dAtA []byte, err error) { +func (m *OrderFilters) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3782,89 +3262,24 @@ func (m *QueryArchiveOrderRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryArchiveOrderRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *OrderFilters) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryArchiveOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *OrderFilters) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.OrderHash) > 0 { - i -= len(m.OrderHash) - copy(dAtA[i:], m.OrderHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHash))) + if len(m.SubaccountID) > 0 { + i -= len(m.SubaccountID) + copy(dAtA[i:], m.SubaccountID) + i = encodeVarintQuery(dAtA, i, uint64(len(m.SubaccountID))) i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryArchiveOrderResponse) 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 *QueryArchiveOrderResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryArchiveOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Order != nil { - { - size, err := m.Order.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *OrderFilters) 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 *OrderFilters) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OrderFilters) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.SubaccountID) > 0 { - i -= len(m.SubaccountID) - copy(dAtA[i:], m.SubaccountID) - i = encodeVarintQuery(dAtA, i, uint64(len(m.SubaccountID))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xca + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xca } if len(m.IndexPrice) > 0 { i -= len(m.IndexPrice) @@ -4261,244 +3676,6 @@ func (m *QuerySpotOrdersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *QueryFillRequestsRequest) 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 *QueryFillRequestsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryFillRequestsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.OrderHash) > 0 { - i -= len(m.OrderHash) - copy(dAtA[i:], m.OrderHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *OrderFillRequest) 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 *OrderFillRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OrderFillRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TakerAssetFillAmount) > 0 { - i -= len(m.TakerAssetFillAmount) - copy(dAtA[i:], m.TakerAssetFillAmount) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TakerAssetFillAmount))) - i-- - dAtA[i] = 0x2a - } - if m.ExpiryAt != 0 { - i = encodeVarintQuery(dAtA, i, uint64((uint64(m.ExpiryAt)<<1)^uint64((m.ExpiryAt>>63)))) - i-- - dAtA[i] = 0x20 - } - if len(m.ApprovalSignatures) > 0 { - for iNdEx := len(m.ApprovalSignatures) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.ApprovalSignatures[iNdEx]) - copy(dAtA[i:], m.ApprovalSignatures[iNdEx]) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ApprovalSignatures[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - if len(m.OrderHash) > 0 { - i -= len(m.OrderHash) - copy(dAtA[i:], m.OrderHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHash))) - i-- - dAtA[i] = 0x12 - } - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *OrderSoftCancelRequest) 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 *OrderSoftCancelRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OrderSoftCancelRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ApprovalSignatures) > 0 { - for iNdEx := len(m.ApprovalSignatures) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.ApprovalSignatures[iNdEx]) - copy(dAtA[i:], m.ApprovalSignatures[iNdEx]) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ApprovalSignatures[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - if len(m.OrderHash) > 0 { - i -= len(m.OrderHash) - copy(dAtA[i:], m.OrderHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.OrderHash))) - i-- - dAtA[i] = 0x12 - } - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryFillRequestsResponse) 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 *QueryFillRequestsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryFillRequestsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.FillRequests) > 0 { - for iNdEx := len(m.FillRequests) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FillRequests[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - -func (m *QueryOutstandingFillRequestsRequest) 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 *QueryOutstandingFillRequestsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryOutstandingFillRequestsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *QueryOutstandingFillRequestsResponse) 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 *QueryOutstandingFillRequestsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryOutstandingFillRequestsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.FillRequests) > 0 { - for iNdEx := len(m.FillRequests) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FillRequests[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - } - return len(dAtA) - i, nil -} - func (m *QueryTradePairRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4939,57 +4116,66 @@ func (m *QueryDerivativeOrderbookResponse) Size() (n int) { return n } -func (m *QueryDerivativeMarketsRequest) Size() (n int) { +func (m *QueryMarginInfoRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - return n -} - -func (m *QueryDerivativeMarketsResponse) Size() (n int) { - if m == nil { - return 0 + l = len(m.MakerAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) } - var l int - _ = l - if len(m.Markets) > 0 { - for _, e := range m.Markets { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } + l = len(m.TakerFee) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.SubaccountID) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.BaseCurrency) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.ExchangeAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) } return n } -func (m *QuerySoftCancelledOrdersRequest) Size() (n int) { +func (m *QueryMarginInfoResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.OrderHashes) > 0 { - for _, s := range m.OrderHashes { - l = len(s) - n += 1 + l + sovQuery(uint64(l)) - } + if m.MarginInfo != nil { + l = m.MarginInfo.Size() + n += 1 + l + sovQuery(uint64(l)) } - if m.ChainId != 0 { - n += 1 + sozQuery(uint64(m.ChainId)) + return n +} + +func (m *QueryDerivativeMarketsRequest) Size() (n int) { + if m == nil { + return 0 } + var l int + _ = l return n } -func (m *QuerySoftCancelledOrdersResponse) Size() (n int) { +func (m *QueryDerivativeMarketsResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.OrderHashes) > 0 { - for _, s := range m.OrderHashes { - l = len(s) + if len(m.Markets) > 0 { + for _, e := range m.Markets { + l = e.Size() n += 1 + l + sovQuery(uint64(l)) } } @@ -5064,50 +4250,21 @@ func (m *QueryActiveOrderResponse) Size() (n int) { return n } -func (m *QueryZeroExTransactionRequest) Size() (n int) { +func (m *QueryArchiveOrderRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.TxHash) + l = len(m.OrderHash) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - return n -} - -func (m *QueryZeroExTransactionResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.TxType != 0 { - n += 1 + sozQuery(uint64(m.TxType)) - } - if len(m.FillRequests) > 0 { - for _, e := range m.FillRequests { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - if len(m.SoftCancelRequests) > 0 { - for _, e := range m.SoftCancelRequests { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *QueryArchiveOrderRequest) Size() (n int) { - if m == nil { - return 0 + l = len(m.MarketId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) } - var l int - _ = l - l = len(m.OrderHash) + l = len(m.SubaccountID) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -5324,115 +4481,6 @@ func (m *QuerySpotOrdersResponse) Size() (n int) { return n } -func (m *QueryFillRequestsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.OrderHash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *OrderFillRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.OrderHash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if len(m.ApprovalSignatures) > 0 { - for _, s := range m.ApprovalSignatures { - l = len(s) - n += 1 + l + sovQuery(uint64(l)) - } - } - if m.ExpiryAt != 0 { - n += 1 + sozQuery(uint64(m.ExpiryAt)) - } - l = len(m.TakerAssetFillAmount) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *OrderSoftCancelRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.OrderHash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if len(m.ApprovalSignatures) > 0 { - for _, s := range m.ApprovalSignatures { - l = len(s) - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *QueryFillRequestsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.FillRequests) > 0 { - for _, e := range m.FillRequests { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - -func (m *QueryOutstandingFillRequestsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - return n -} - -func (m *QueryOutstandingFillRequestsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.FillRequests) > 0 { - for _, e := range m.FillRequests { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - return n -} - func (m *QueryTradePairRequest) Size() (n int) { if m == nil { return 0 @@ -6304,7 +5352,7 @@ func (m *QueryDerivativeOrderbookResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryDerivativeMarketsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryMarginInfoRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6327,70 +5375,49 @@ func (m *QueryDerivativeMarketsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryDerivativeMarketsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryMarginInfoRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDerivativeMarketsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryMarginInfoRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MakerAddress", wireType) } - if skippy < 0 { - return ErrInvalidLengthQuery + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } } - if (iNdEx + skippy) < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryDerivativeMarketsResponse) 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 ErrIntOverflowQuery + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery } - if iNdEx >= l { + if postIndex > 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: QueryDerivativeMarketsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryDerivativeMarketsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + m.MakerAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Markets", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TakerFee", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6400,31 +5427,125 @@ func (m *QueryDerivativeMarketsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.Markets = append(m.Markets, &DerivativeMarket{}) - if err := m.Markets[len(m.Markets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.TakerFee = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SubaccountID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SubaccountID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BaseCurrency", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.BaseCurrency = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExchangeAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ExchangeAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err } if skippy < 0 { return ErrInvalidLengthQuery @@ -6444,7 +5565,7 @@ func (m *QueryDerivativeMarketsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QuerySoftCancelledOrdersRequest) Unmarshal(dAtA []byte) error { +func (m *QueryMarginInfoResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6467,17 +5588,17 @@ func (m *QuerySoftCancelledOrdersRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QuerySoftCancelledOrdersRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryMarginInfoResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QuerySoftCancelledOrdersRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryMarginInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHashes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MarginInfo", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6487,45 +5608,81 @@ func (m *QuerySoftCancelledOrdersRequest) 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 } - m.OrderHashes = append(m.OrderHashes, string(dAtA[iNdEx:postIndex])) + if m.MarginInfo == nil { + m.MarginInfo = &MarginInfo{} + } + if err := m.MarginInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryDerivativeMarketsRequest) 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 ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) - m.ChainId = int64(v) + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryDerivativeMarketsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDerivativeMarketsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -6550,7 +5707,7 @@ func (m *QuerySoftCancelledOrdersRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QuerySoftCancelledOrdersResponse) Unmarshal(dAtA []byte) error { +func (m *QueryDerivativeMarketsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6573,17 +5730,17 @@ func (m *QuerySoftCancelledOrdersResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QuerySoftCancelledOrdersResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryDerivativeMarketsResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QuerySoftCancelledOrdersResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryDerivativeMarketsResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHashes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Markets", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6593,23 +5750,25 @@ func (m *QuerySoftCancelledOrdersResponse) 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 } - m.OrderHashes = append(m.OrderHashes, string(dAtA[iNdEx:postIndex])) + m.Markets = append(m.Markets, &DerivativeMarket{}) + if err := m.Markets[len(m.Markets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -7111,7 +6270,7 @@ func (m *QueryActiveOrderResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryZeroExTransactionRequest) Unmarshal(dAtA []byte) error { +func (m *QueryArchiveOrderRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7134,15 +6293,15 @@ func (m *QueryZeroExTransactionRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryZeroExTransactionRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryArchiveOrderRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryZeroExTransactionRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryArchiveOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field OrderHash", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7170,66 +6329,13 @@ func (m *QueryZeroExTransactionRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TxHash = string(dAtA[iNdEx:postIndex]) + m.OrderHash = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryZeroExTransactionResponse) 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 ErrIntOverflowQuery - } - 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: QueryZeroExTransactionResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryZeroExTransactionResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TxType", wireType) + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MarketId", wireType) } - var v uint64 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7239,137 +6345,27 @@ func (m *QueryZeroExTransactionResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= uint64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) - m.TxType = int64(v) - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FillRequests", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.FillRequests = append(m.FillRequests, &OrderFillRequest{}) - if err := m.FillRequests[len(m.FillRequests)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.MarketId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SoftCancelRequests", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SoftCancelRequests = append(m.SoftCancelRequests, &OrderSoftCancelRequest{}) - if err := m.SoftCancelRequests[len(m.SoftCancelRequests)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryArchiveOrderRequest) 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 ErrIntOverflowQuery - } - 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: QueryArchiveOrderRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryArchiveOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SubaccountID", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7397,7 +6393,7 @@ func (m *QueryArchiveOrderRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.OrderHash = string(dAtA[iNdEx:postIndex]) + m.SubaccountID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -8979,701 +7975,6 @@ func (m *QuerySpotOrdersResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryFillRequestsRequest) 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 ErrIntOverflowQuery - } - 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: QueryFillRequestsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFillRequestsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OrderHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *OrderFillRequest) 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 ErrIntOverflowQuery - } - 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: OrderFillRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OrderFillRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OrderHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ApprovalSignatures", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ApprovalSignatures = append(m.ApprovalSignatures, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpiryAt", wireType) - } - var v uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - v = (v >> 1) ^ uint64((int64(v&1)<<63)>>63) - m.ExpiryAt = int64(v) - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TakerAssetFillAmount", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TakerAssetFillAmount = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *OrderSoftCancelRequest) 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 ErrIntOverflowQuery - } - 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: OrderSoftCancelRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OrderSoftCancelRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.OrderHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ApprovalSignatures", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ApprovalSignatures = append(m.ApprovalSignatures, string(dAtA[iNdEx:postIndex])) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryFillRequestsResponse) 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 ErrIntOverflowQuery - } - 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: QueryFillRequestsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryFillRequestsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FillRequests", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FillRequests = append(m.FillRequests, &OrderFillRequest{}) - if err := m.FillRequests[len(m.FillRequests)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryOutstandingFillRequestsRequest) 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 ErrIntOverflowQuery - } - 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: QueryOutstandingFillRequestsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOutstandingFillRequestsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - 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 ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxHash = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryOutstandingFillRequestsResponse) 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 ErrIntOverflowQuery - } - 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: QueryOutstandingFillRequestsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryOutstandingFillRequestsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FillRequests", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.FillRequests = append(m.FillRequests, &OrderFillRequest{}) - if err := m.FillRequests[len(m.FillRequests)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *QueryTradePairRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/chain/orders/types/types.go b/chain/orders/types/types.go index c2bb0cdc..9a1c2f2a 100644 --- a/chain/orders/types/types.go +++ b/chain/orders/types/types.go @@ -2,14 +2,15 @@ package types import ( "errors" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "math/big" "strings" + "time" "github.com/ethereum/go-ethereum/common" "golang.org/x/crypto/sha3" ) - type Direction uint8 const ( @@ -92,7 +93,6 @@ func (o OrderStatus) String() string { } } - func OrderStatusFromString(status string) OrderStatus { switch status { case "invalid": @@ -225,6 +225,14 @@ func (p TradePair) ComputeHash() (common.Hash, error) { return hash, nil } +func ComputeMarketHash(exchangeAddress common.Address, marketID common.Hash) common.Hash { + hash := common.BytesToHash(keccak256( + marketID.Bytes(), + exchangeAddress.Bytes(), + )) + return hash +} + func (p DerivativeMarket) Hash() (common.Hash, error) { if len(p.GetMarketId()) == 0 { return common.Hash{}, errors.New("hash error: no MarketId specified") @@ -247,6 +255,17 @@ func (p DerivativeMarket) Hash() (common.Hash, error) { return hash, nil } +func (m *DerivativeMarket) CheckExpiration(currBlockTime time.Time) error { + nextFundingTimestamp, fundingInterval := BigNum(m.GetNextFundingTimestamp()).Int(), BigNum(m.GetFundingInterval()).Int() + if fundingInterval.Cmp(big.NewInt(0)) == 0 { + // expiration time must be greater than current block time + if nextFundingTimestamp.Cmp(big.NewInt(currBlockTime.Unix())) <= 0 { + return sdkerrors.Wrap(ErrMarketExpired, m.GetTicker()) + } + } + return nil +} + // keccak256 calculates and returns the Keccak256 hash of the input data. func keccak256(data ...[]byte) []byte { d := sha3.NewLegacyKeccak256() @@ -255,11 +274,3 @@ func keccak256(data ...[]byte) []byte { } return d.Sum(nil) } - -type ZeroExTransactionType int - -const ( - ZeroExTransactionTypeUnknown ZeroExTransactionType = 0 - ZeroExOrderFillRequestTx ZeroExTransactionType = 1 - ZeroExOrderSoftCancelRequestTx ZeroExTransactionType = 2 -)