diff --git a/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/events/events.ts b/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/events/events.ts index d73e35661c..e90dd087b7 100644 --- a/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/events/events.ts +++ b/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/events/events.ts @@ -624,7 +624,6 @@ export interface StatefulOrderEventV1 { conditionalOrderPlacement?: StatefulOrderEventV1_ConditionalOrderPlacementV1; conditionalOrderTriggered?: StatefulOrderEventV1_ConditionalOrderTriggeredV1; longTermOrderPlacement?: StatefulOrderEventV1_LongTermOrderPlacementV1; - orderReplacement?: StatefulOrderEventV1_LongTermOrderReplacementV1; } /** * StatefulOrderEvent message contains information about a change to a stateful @@ -639,7 +638,6 @@ export interface StatefulOrderEventV1SDKType { conditional_order_placement?: StatefulOrderEventV1_ConditionalOrderPlacementV1SDKType; conditional_order_triggered?: StatefulOrderEventV1_ConditionalOrderTriggeredV1SDKType; long_term_order_placement?: StatefulOrderEventV1_LongTermOrderPlacementV1SDKType; - order_replacement?: StatefulOrderEventV1_LongTermOrderReplacementV1SDKType; } /** A stateful order placement contains an order. */ @@ -711,20 +709,6 @@ export interface StatefulOrderEventV1_LongTermOrderPlacementV1 { export interface StatefulOrderEventV1_LongTermOrderPlacementV1SDKType { order?: IndexerOrderSDKType; } -/** A long term order replacement contains an old order ID and the new order. */ - -export interface StatefulOrderEventV1_LongTermOrderReplacementV1 { - /** vault replaces orders with a different order ID */ - oldOrderId?: IndexerOrderId; - order?: IndexerOrder; -} -/** A long term order replacement contains an old order ID and the new order. */ - -export interface StatefulOrderEventV1_LongTermOrderReplacementV1SDKType { - /** vault replaces orders with a different order ID */ - old_order_id?: IndexerOrderIdSDKType; - order?: IndexerOrderSDKType; -} /** * AssetCreateEventV1 message contains all the information about an new Asset on * the dYdX chain. @@ -2403,8 +2387,7 @@ function createBaseStatefulOrderEventV1(): StatefulOrderEventV1 { orderRemoval: undefined, conditionalOrderPlacement: undefined, conditionalOrderTriggered: undefined, - longTermOrderPlacement: undefined, - orderReplacement: undefined + longTermOrderPlacement: undefined }; } @@ -2430,10 +2413,6 @@ export const StatefulOrderEventV1 = { StatefulOrderEventV1_LongTermOrderPlacementV1.encode(message.longTermOrderPlacement, writer.uint32(58).fork()).ldelim(); } - if (message.orderReplacement !== undefined) { - StatefulOrderEventV1_LongTermOrderReplacementV1.encode(message.orderReplacement, writer.uint32(66).fork()).ldelim(); - } - return writer; }, @@ -2466,10 +2445,6 @@ export const StatefulOrderEventV1 = { message.longTermOrderPlacement = StatefulOrderEventV1_LongTermOrderPlacementV1.decode(reader, reader.uint32()); break; - case 8: - message.orderReplacement = StatefulOrderEventV1_LongTermOrderReplacementV1.decode(reader, reader.uint32()); - break; - default: reader.skipType(tag & 7); break; @@ -2486,7 +2461,6 @@ export const StatefulOrderEventV1 = { message.conditionalOrderPlacement = object.conditionalOrderPlacement !== undefined && object.conditionalOrderPlacement !== null ? StatefulOrderEventV1_ConditionalOrderPlacementV1.fromPartial(object.conditionalOrderPlacement) : undefined; message.conditionalOrderTriggered = object.conditionalOrderTriggered !== undefined && object.conditionalOrderTriggered !== null ? StatefulOrderEventV1_ConditionalOrderTriggeredV1.fromPartial(object.conditionalOrderTriggered) : undefined; message.longTermOrderPlacement = object.longTermOrderPlacement !== undefined && object.longTermOrderPlacement !== null ? StatefulOrderEventV1_LongTermOrderPlacementV1.fromPartial(object.longTermOrderPlacement) : undefined; - message.orderReplacement = object.orderReplacement !== undefined && object.orderReplacement !== null ? StatefulOrderEventV1_LongTermOrderReplacementV1.fromPartial(object.orderReplacement) : undefined; return message; } @@ -2727,61 +2701,6 @@ export const StatefulOrderEventV1_LongTermOrderPlacementV1 = { }; -function createBaseStatefulOrderEventV1_LongTermOrderReplacementV1(): StatefulOrderEventV1_LongTermOrderReplacementV1 { - return { - oldOrderId: undefined, - order: undefined - }; -} - -export const StatefulOrderEventV1_LongTermOrderReplacementV1 = { - encode(message: StatefulOrderEventV1_LongTermOrderReplacementV1, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (message.oldOrderId !== undefined) { - IndexerOrderId.encode(message.oldOrderId, writer.uint32(10).fork()).ldelim(); - } - - if (message.order !== undefined) { - IndexerOrder.encode(message.order, writer.uint32(18).fork()).ldelim(); - } - - return writer; - }, - - decode(input: _m0.Reader | Uint8Array, length?: number): StatefulOrderEventV1_LongTermOrderReplacementV1 { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseStatefulOrderEventV1_LongTermOrderReplacementV1(); - - while (reader.pos < end) { - const tag = reader.uint32(); - - switch (tag >>> 3) { - case 1: - message.oldOrderId = IndexerOrderId.decode(reader, reader.uint32()); - break; - - case 2: - message.order = IndexerOrder.decode(reader, reader.uint32()); - break; - - default: - reader.skipType(tag & 7); - break; - } - } - - return message; - }, - - fromPartial(object: DeepPartial): StatefulOrderEventV1_LongTermOrderReplacementV1 { - const message = createBaseStatefulOrderEventV1_LongTermOrderReplacementV1(); - message.oldOrderId = object.oldOrderId !== undefined && object.oldOrderId !== null ? IndexerOrderId.fromPartial(object.oldOrderId) : undefined; - message.order = object.order !== undefined && object.order !== null ? IndexerOrder.fromPartial(object.order) : undefined; - return message; - } - -}; - function createBaseAssetCreateEventV1(): AssetCreateEventV1 { return { id: 0, diff --git a/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/off_chain_updates/off_chain_updates.ts b/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/off_chain_updates/off_chain_updates.ts index 891d5f3c87..e66f9b0e5c 100644 --- a/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/off_chain_updates/off_chain_updates.ts +++ b/indexer/packages/v4-protos/src/codegen/dydxprotocol/indexer/off_chain_updates/off_chain_updates.ts @@ -1,8 +1,7 @@ import { IndexerOrder, IndexerOrderSDKType, IndexerOrderId, IndexerOrderIdSDKType } from "../protocol/v1/clob"; -import { Timestamp } from "../../../google/protobuf/timestamp"; import { OrderRemovalReason, OrderRemovalReasonSDKType } from "../shared/removal_reason"; import * as _m0 from "protobufjs/minimal"; -import { toTimestamp, fromTimestamp, DeepPartial, Long } from "../../../helpers"; +import { DeepPartial, Long } from "../../../helpers"; /** * OrderPlacementStatus is an enum for the resulting status after an order is * placed. @@ -221,18 +220,12 @@ export function orderRemoveV1_OrderRemovalStatusToJSON(object: OrderRemoveV1_Ord export interface OrderPlaceV1 { order?: IndexerOrder; placementStatus: OrderPlaceV1_OrderPlacementStatus; - /** The timestamp of the order placement. */ - - timeStamp?: Date; } /** OrderPlace messages contain the order placed/replaced. */ export interface OrderPlaceV1SDKType { order?: IndexerOrderSDKType; placement_status: OrderPlaceV1_OrderPlacementStatusSDKType; - /** The timestamp of the order placement. */ - - time_stamp?: Date; } /** * OrderRemove messages contain the id of the order removed, the reason for the @@ -243,9 +236,6 @@ export interface OrderRemoveV1 { removedOrderId?: IndexerOrderId; reason: OrderRemovalReason; removalStatus: OrderRemoveV1_OrderRemovalStatus; - /** The timestamp of the order removal. */ - - timeStamp?: Date; } /** * OrderRemove messages contain the id of the order removed, the reason for the @@ -256,9 +246,6 @@ export interface OrderRemoveV1SDKType { removed_order_id?: IndexerOrderIdSDKType; reason: OrderRemovalReasonSDKType; removal_status: OrderRemoveV1_OrderRemovalStatusSDKType; - /** The timestamp of the order removal. */ - - time_stamp?: Date; } /** * OrderUpdate messages contain the id of the order being updated, and the @@ -278,24 +265,6 @@ export interface OrderUpdateV1SDKType { order_id?: IndexerOrderIdSDKType; total_filled_quantums: Long; } -/** OrderReplace messages contain the old order ID and the replacement order. */ - -export interface OrderReplaceV1 { - /** vault replaces orders with a different order ID */ - oldOrderId?: IndexerOrderId; - order?: IndexerOrder; - placementStatus: OrderPlaceV1_OrderPlacementStatus; - timeStamp?: Date; -} -/** OrderReplace messages contain the old order ID and the replacement order. */ - -export interface OrderReplaceV1SDKType { - /** vault replaces orders with a different order ID */ - old_order_id?: IndexerOrderIdSDKType; - order?: IndexerOrderSDKType; - placement_status: OrderPlaceV1_OrderPlacementStatusSDKType; - time_stamp?: Date; -} /** * An OffChainUpdate message is the message type which will be sent on Kafka to * the Indexer. @@ -305,7 +274,6 @@ export interface OffChainUpdateV1 { orderPlace?: OrderPlaceV1; orderRemove?: OrderRemoveV1; orderUpdate?: OrderUpdateV1; - orderReplace?: OrderReplaceV1; } /** * An OffChainUpdate message is the message type which will be sent on Kafka to @@ -316,14 +284,12 @@ export interface OffChainUpdateV1SDKType { order_place?: OrderPlaceV1SDKType; order_remove?: OrderRemoveV1SDKType; order_update?: OrderUpdateV1SDKType; - order_replace?: OrderReplaceV1SDKType; } function createBaseOrderPlaceV1(): OrderPlaceV1 { return { order: undefined, - placementStatus: 0, - timeStamp: undefined + placementStatus: 0 }; } @@ -337,10 +303,6 @@ export const OrderPlaceV1 = { writer.uint32(16).int32(message.placementStatus); } - if (message.timeStamp !== undefined) { - Timestamp.encode(toTimestamp(message.timeStamp), writer.uint32(26).fork()).ldelim(); - } - return writer; }, @@ -361,10 +323,6 @@ export const OrderPlaceV1 = { message.placementStatus = (reader.int32() as any); break; - case 3: - message.timeStamp = fromTimestamp(Timestamp.decode(reader, reader.uint32())); - break; - default: reader.skipType(tag & 7); break; @@ -378,7 +336,6 @@ export const OrderPlaceV1 = { const message = createBaseOrderPlaceV1(); message.order = object.order !== undefined && object.order !== null ? IndexerOrder.fromPartial(object.order) : undefined; message.placementStatus = object.placementStatus ?? 0; - message.timeStamp = object.timeStamp ?? undefined; return message; } @@ -388,8 +345,7 @@ function createBaseOrderRemoveV1(): OrderRemoveV1 { return { removedOrderId: undefined, reason: 0, - removalStatus: 0, - timeStamp: undefined + removalStatus: 0 }; } @@ -407,10 +363,6 @@ export const OrderRemoveV1 = { writer.uint32(24).int32(message.removalStatus); } - if (message.timeStamp !== undefined) { - Timestamp.encode(toTimestamp(message.timeStamp), writer.uint32(34).fork()).ldelim(); - } - return writer; }, @@ -435,10 +387,6 @@ export const OrderRemoveV1 = { message.removalStatus = (reader.int32() as any); break; - case 4: - message.timeStamp = fromTimestamp(Timestamp.decode(reader, reader.uint32())); - break; - default: reader.skipType(tag & 7); break; @@ -453,7 +401,6 @@ export const OrderRemoveV1 = { message.removedOrderId = object.removedOrderId !== undefined && object.removedOrderId !== null ? IndexerOrderId.fromPartial(object.removedOrderId) : undefined; message.reason = object.reason ?? 0; message.removalStatus = object.removalStatus ?? 0; - message.timeStamp = object.timeStamp ?? undefined; return message; } @@ -514,87 +461,11 @@ export const OrderUpdateV1 = { }; -function createBaseOrderReplaceV1(): OrderReplaceV1 { - return { - oldOrderId: undefined, - order: undefined, - placementStatus: 0, - timeStamp: undefined - }; -} - -export const OrderReplaceV1 = { - encode(message: OrderReplaceV1, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (message.oldOrderId !== undefined) { - IndexerOrderId.encode(message.oldOrderId, writer.uint32(10).fork()).ldelim(); - } - - if (message.order !== undefined) { - IndexerOrder.encode(message.order, writer.uint32(18).fork()).ldelim(); - } - - if (message.placementStatus !== 0) { - writer.uint32(24).int32(message.placementStatus); - } - - if (message.timeStamp !== undefined) { - Timestamp.encode(toTimestamp(message.timeStamp), writer.uint32(34).fork()).ldelim(); - } - - return writer; - }, - - decode(input: _m0.Reader | Uint8Array, length?: number): OrderReplaceV1 { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); - let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseOrderReplaceV1(); - - while (reader.pos < end) { - const tag = reader.uint32(); - - switch (tag >>> 3) { - case 1: - message.oldOrderId = IndexerOrderId.decode(reader, reader.uint32()); - break; - - case 2: - message.order = IndexerOrder.decode(reader, reader.uint32()); - break; - - case 3: - message.placementStatus = (reader.int32() as any); - break; - - case 4: - message.timeStamp = fromTimestamp(Timestamp.decode(reader, reader.uint32())); - break; - - default: - reader.skipType(tag & 7); - break; - } - } - - return message; - }, - - fromPartial(object: DeepPartial): OrderReplaceV1 { - const message = createBaseOrderReplaceV1(); - message.oldOrderId = object.oldOrderId !== undefined && object.oldOrderId !== null ? IndexerOrderId.fromPartial(object.oldOrderId) : undefined; - message.order = object.order !== undefined && object.order !== null ? IndexerOrder.fromPartial(object.order) : undefined; - message.placementStatus = object.placementStatus ?? 0; - message.timeStamp = object.timeStamp ?? undefined; - return message; - } - -}; - function createBaseOffChainUpdateV1(): OffChainUpdateV1 { return { orderPlace: undefined, orderRemove: undefined, - orderUpdate: undefined, - orderReplace: undefined + orderUpdate: undefined }; } @@ -612,10 +483,6 @@ export const OffChainUpdateV1 = { OrderUpdateV1.encode(message.orderUpdate, writer.uint32(26).fork()).ldelim(); } - if (message.orderReplace !== undefined) { - OrderReplaceV1.encode(message.orderReplace, writer.uint32(34).fork()).ldelim(); - } - return writer; }, @@ -640,10 +507,6 @@ export const OffChainUpdateV1 = { message.orderUpdate = OrderUpdateV1.decode(reader, reader.uint32()); break; - case 4: - message.orderReplace = OrderReplaceV1.decode(reader, reader.uint32()); - break; - default: reader.skipType(tag & 7); break; @@ -658,7 +521,6 @@ export const OffChainUpdateV1 = { message.orderPlace = object.orderPlace !== undefined && object.orderPlace !== null ? OrderPlaceV1.fromPartial(object.orderPlace) : undefined; message.orderRemove = object.orderRemove !== undefined && object.orderRemove !== null ? OrderRemoveV1.fromPartial(object.orderRemove) : undefined; message.orderUpdate = object.orderUpdate !== undefined && object.orderUpdate !== null ? OrderUpdateV1.fromPartial(object.orderUpdate) : undefined; - message.orderReplace = object.orderReplace !== undefined && object.orderReplace !== null ? OrderReplaceV1.fromPartial(object.orderReplace) : undefined; return message; } diff --git a/proto/dydxprotocol/indexer/events/events.proto b/proto/dydxprotocol/indexer/events/events.proto index ed3966c8e2..c8af386296 100644 --- a/proto/dydxprotocol/indexer/events/events.proto +++ b/proto/dydxprotocol/indexer/events/events.proto @@ -247,7 +247,6 @@ message StatefulOrderEventV1 { ConditionalOrderPlacementV1 conditional_order_placement = 5; ConditionalOrderTriggeredV1 conditional_order_triggered = 6; LongTermOrderPlacementV1 long_term_order_placement = 7; - LongTermOrderReplacementV1 order_replacement = 8; } // A stateful order placement contains an order. @@ -278,13 +277,6 @@ message StatefulOrderEventV1 { message LongTermOrderPlacementV1 { dydxprotocol.indexer.protocol.v1.IndexerOrder order = 1; } - - // A long term order replacement contains an old order ID and the new order. - message LongTermOrderReplacementV1 { - dydxprotocol.indexer.protocol.v1.IndexerOrderId old_order_id = - 1; // vault replaces orders with a different order ID - dydxprotocol.indexer.protocol.v1.IndexerOrder order = 2; - } } // AssetCreateEventV1 message contains all the information about an new Asset on diff --git a/proto/dydxprotocol/indexer/off_chain_updates/off_chain_updates.proto b/proto/dydxprotocol/indexer/off_chain_updates/off_chain_updates.proto index 04ddda198b..1e80bddc6d 100644 --- a/proto/dydxprotocol/indexer/off_chain_updates/off_chain_updates.proto +++ b/proto/dydxprotocol/indexer/off_chain_updates/off_chain_updates.proto @@ -3,8 +3,6 @@ package dydxprotocol.indexer.off_chain_updates; import "dydxprotocol/indexer/shared/removal_reason.proto"; import "dydxprotocol/indexer/protocol/v1/clob.proto"; -import "google/protobuf/timestamp.proto"; -import "gogoproto/gogo.proto"; option go_package = "github.com/dydxprotocol/v4-chain/protocol/indexer/off_chain_updates/types"; @@ -37,10 +35,6 @@ message OrderPlaceV1 { // out by protocol. ORDER_PLACEMENT_STATUS_OPENED = 2; } - - // The timestamp of the order placement. - google.protobuf.Timestamp time_stamp = 3 - [ (gogoproto.nullable) = true, (gogoproto.stdtime) = true ]; } // OrderRemove messages contain the id of the order removed, the reason for the @@ -75,10 +69,6 @@ message OrderRemoveV1 { // An order was fully-filled. Only sent by the Indexer for stateful orders. ORDER_REMOVAL_STATUS_FILLED = 3; } - - // The timestamp of the order removal. - google.protobuf.Timestamp time_stamp = 4 - [ (gogoproto.nullable) = true, (gogoproto.stdtime) = true ]; } // OrderUpdate messages contain the id of the order being updated, and the @@ -88,27 +78,13 @@ message OrderUpdateV1 { uint64 total_filled_quantums = 2; } -// OrderReplace messages contain the old order ID and the replacement order. -message OrderReplaceV1 { - dydxprotocol.indexer.protocol.v1.IndexerOrderId old_order_id = - 1; // vault replaces orders with a different order ID - dydxprotocol.indexer.protocol.v1.IndexerOrder order = 2; - dydxprotocol.indexer.off_chain_updates.OrderPlaceV1.OrderPlacementStatus - placement_status = 3; - - google.protobuf.Timestamp time_stamp = 4 - [ (gogoproto.nullable) = true, (gogoproto.stdtime) = true ]; -} - // An OffChainUpdate message is the message type which will be sent on Kafka to // the Indexer. message OffChainUpdateV1 { - // Contains one of an OrderPlaceV1, OrderRemoveV1, OrderUpdateV1, and - // OrderReplaceV1 message. + // Contains one of an OrderPlaceV1, OrderRemoveV1, and OrderUpdateV1 message. oneof update_message { OrderPlaceV1 order_place = 1; OrderRemoveV1 order_remove = 2; OrderUpdateV1 order_update = 3; - OrderReplaceV1 order_replace = 4; } } diff --git a/protocol/.github/workflows/release.yml b/protocol/.github/workflows/release.yml index 2630bccd6e..b3437ed154 100644 --- a/protocol/.github/workflows/release.yml +++ b/protocol/.github/workflows/release.yml @@ -8,6 +8,7 @@ on: # yamllint disable-line rule:truthy - "v[0-9]+.[0-9]+.[0-9]+" # e.g.: v1.0.1 - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" # e.g.: v1.0.1-rc1 + jobs: build: permissions: diff --git a/protocol/app/app.go b/protocol/app/app.go index f57bcf5f37..0a75076840 100644 --- a/protocol/app/app.go +++ b/protocol/app/app.go @@ -1090,7 +1090,6 @@ func New( app.PricesKeeper, app.SendingKeeper, app.SubaccountsKeeper, - app.IndexerEventManager, []string{ lib.GovModuleAddress.String(), delaymsgmoduletypes.ModuleAddress.String(), @@ -1206,13 +1205,15 @@ func New( perpetualsmoduletypes.ModuleName, statsmoduletypes.ModuleName, satypes.ModuleName, + // should be before clob EndBlocker so that vault order cancels are + // processed before any vault order expirations (handled by clob) + vaultmoduletypes.ModuleName, clobmoduletypes.ModuleName, vestmoduletypes.ModuleName, rewardsmoduletypes.ModuleName, sendingmoduletypes.ModuleName, govplusmoduletypes.ModuleName, delaymsgmoduletypes.ModuleName, - vaultmoduletypes.ModuleName, ) app.ModuleManager.SetOrderPrepareCheckStaters( @@ -1245,9 +1246,6 @@ func New( perpetualsmoduletypes.ModuleName, statsmoduletypes.ModuleName, satypes.ModuleName, - // should be before clob EndBlocker so that vault order cancels are - // processed before any vault order expirations (handled by clob) - vaultmoduletypes.ModuleName, clobmoduletypes.ModuleName, sendingmoduletypes.ModuleName, vestmoduletypes.ModuleName, @@ -1255,6 +1253,7 @@ func New( epochsmoduletypes.ModuleName, govplusmoduletypes.ModuleName, delaymsgmoduletypes.ModuleName, + vaultmoduletypes.ModuleName, authz.ModuleName, // No-op. blocktimemoduletypes.ModuleName, // Must be last ) diff --git a/protocol/indexer/events/events.pb.go b/protocol/indexer/events/events.pb.go index 1beb328980..42758bacda 100644 --- a/protocol/indexer/events/events.pb.go +++ b/protocol/indexer/events/events.pb.go @@ -1128,7 +1128,6 @@ type StatefulOrderEventV1 struct { // *StatefulOrderEventV1_ConditionalOrderPlacement // *StatefulOrderEventV1_ConditionalOrderTriggered // *StatefulOrderEventV1_LongTermOrderPlacement - // *StatefulOrderEventV1_OrderReplacement Event isStatefulOrderEventV1_Event `protobuf_oneof:"event"` } @@ -1186,16 +1185,12 @@ type StatefulOrderEventV1_ConditionalOrderTriggered struct { type StatefulOrderEventV1_LongTermOrderPlacement struct { LongTermOrderPlacement *StatefulOrderEventV1_LongTermOrderPlacementV1 `protobuf:"bytes,7,opt,name=long_term_order_placement,json=longTermOrderPlacement,proto3,oneof" json:"long_term_order_placement,omitempty"` } -type StatefulOrderEventV1_OrderReplacement struct { - OrderReplacement *StatefulOrderEventV1_LongTermOrderReplacementV1 `protobuf:"bytes,8,opt,name=order_replacement,json=orderReplacement,proto3,oneof" json:"order_replacement,omitempty"` -} func (*StatefulOrderEventV1_OrderPlace) isStatefulOrderEventV1_Event() {} func (*StatefulOrderEventV1_OrderRemoval) isStatefulOrderEventV1_Event() {} func (*StatefulOrderEventV1_ConditionalOrderPlacement) isStatefulOrderEventV1_Event() {} func (*StatefulOrderEventV1_ConditionalOrderTriggered) isStatefulOrderEventV1_Event() {} func (*StatefulOrderEventV1_LongTermOrderPlacement) isStatefulOrderEventV1_Event() {} -func (*StatefulOrderEventV1_OrderReplacement) isStatefulOrderEventV1_Event() {} func (m *StatefulOrderEventV1) GetEvent() isStatefulOrderEventV1_Event { if m != nil { @@ -1239,13 +1234,6 @@ func (m *StatefulOrderEventV1) GetLongTermOrderPlacement() *StatefulOrderEventV1 return nil } -func (m *StatefulOrderEventV1) GetOrderReplacement() *StatefulOrderEventV1_LongTermOrderReplacementV1 { - if x, ok := m.GetEvent().(*StatefulOrderEventV1_OrderReplacement); ok { - return x.OrderReplacement - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*StatefulOrderEventV1) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -1254,7 +1242,6 @@ func (*StatefulOrderEventV1) XXX_OneofWrappers() []interface{} { (*StatefulOrderEventV1_ConditionalOrderPlacement)(nil), (*StatefulOrderEventV1_ConditionalOrderTriggered)(nil), (*StatefulOrderEventV1_LongTermOrderPlacement)(nil), - (*StatefulOrderEventV1_OrderReplacement)(nil), } } @@ -1514,63 +1501,6 @@ func (m *StatefulOrderEventV1_LongTermOrderPlacementV1) GetOrder() *types.Indexe return nil } -// A long term order replacement contains an old order ID and the new order. -type StatefulOrderEventV1_LongTermOrderReplacementV1 struct { - OldOrderId *types.IndexerOrderId `protobuf:"bytes,1,opt,name=old_order_id,json=oldOrderId,proto3" json:"old_order_id,omitempty"` - Order *types.IndexerOrder `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` -} - -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) Reset() { - *m = StatefulOrderEventV1_LongTermOrderReplacementV1{} -} -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) String() string { - return proto.CompactTextString(m) -} -func (*StatefulOrderEventV1_LongTermOrderReplacementV1) ProtoMessage() {} -func (*StatefulOrderEventV1_LongTermOrderReplacementV1) Descriptor() ([]byte, []int) { - return fileDescriptor_6331dfb59c6fd2bb, []int{13, 5} -} -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_StatefulOrderEventV1_LongTermOrderReplacementV1.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 *StatefulOrderEventV1_LongTermOrderReplacementV1) XXX_Merge(src proto.Message) { - xxx_messageInfo_StatefulOrderEventV1_LongTermOrderReplacementV1.Merge(m, src) -} -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) XXX_Size() int { - return m.Size() -} -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) XXX_DiscardUnknown() { - xxx_messageInfo_StatefulOrderEventV1_LongTermOrderReplacementV1.DiscardUnknown(m) -} - -var xxx_messageInfo_StatefulOrderEventV1_LongTermOrderReplacementV1 proto.InternalMessageInfo - -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) GetOldOrderId() *types.IndexerOrderId { - if m != nil { - return m.OldOrderId - } - return nil -} - -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) GetOrder() *types.IndexerOrder { - if m != nil { - return m.Order - } - return nil -} - // AssetCreateEventV1 message contains all the information about an new Asset on // the dYdX chain. type AssetCreateEventV1 struct { @@ -2555,7 +2485,6 @@ func init() { proto.RegisterType((*StatefulOrderEventV1_ConditionalOrderPlacementV1)(nil), "dydxprotocol.indexer.events.StatefulOrderEventV1.ConditionalOrderPlacementV1") proto.RegisterType((*StatefulOrderEventV1_ConditionalOrderTriggeredV1)(nil), "dydxprotocol.indexer.events.StatefulOrderEventV1.ConditionalOrderTriggeredV1") proto.RegisterType((*StatefulOrderEventV1_LongTermOrderPlacementV1)(nil), "dydxprotocol.indexer.events.StatefulOrderEventV1.LongTermOrderPlacementV1") - proto.RegisterType((*StatefulOrderEventV1_LongTermOrderReplacementV1)(nil), "dydxprotocol.indexer.events.StatefulOrderEventV1.LongTermOrderReplacementV1") proto.RegisterType((*AssetCreateEventV1)(nil), "dydxprotocol.indexer.events.AssetCreateEventV1") proto.RegisterType((*PerpetualMarketCreateEventV1)(nil), "dydxprotocol.indexer.events.PerpetualMarketCreateEventV1") proto.RegisterType((*PerpetualMarketCreateEventV2)(nil), "dydxprotocol.indexer.events.PerpetualMarketCreateEventV2") @@ -2574,152 +2503,149 @@ func init() { } var fileDescriptor_6331dfb59c6fd2bb = []byte{ - // 2316 bytes of a gzipped FileDescriptorProto + // 2269 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0x4f, 0xdb, 0x8e, 0xe3, 0x3c, 0xc7, 0x19, 0xbb, 0xc6, 0xc9, 0x38, 0x09, 0x64, 0x86, 0x96, - 0x90, 0x46, 0xfb, 0xe1, 0x4c, 0xc2, 0x2e, 0x5a, 0xed, 0x01, 0x11, 0xe7, 0x63, 0xe3, 0x28, 0xc9, - 0x78, 0x3b, 0xc9, 0xec, 0xee, 0x80, 0xb6, 0xa9, 0x74, 0x57, 0x9c, 0x52, 0xfa, 0x6b, 0xba, 0xda, - 0x99, 0xc9, 0x20, 0x24, 0x6e, 0x70, 0x40, 0x02, 0x09, 0x71, 0xe0, 0x80, 0xc4, 0x05, 0x0e, 0x48, - 0x1c, 0x90, 0x10, 0x37, 0x0e, 0x88, 0xcb, 0xde, 0x18, 0x71, 0x59, 0xc4, 0x61, 0x85, 0x66, 0x0e, - 0xfc, 0x1b, 0xa8, 0x3e, 0xba, 0xfd, 0xed, 0xf1, 0x4c, 0xb2, 0x12, 0x42, 0x9c, 0xec, 0x7a, 0xaf, - 0xde, 0xef, 0xbd, 0x7a, 0xef, 0x55, 0xd5, 0xab, 0xd7, 0x70, 0xd7, 0xbe, 0xb4, 0x9f, 0x04, 0xa1, - 0x1f, 0xf9, 0x96, 0xef, 0xac, 0x50, 0xcf, 0x26, 0x4f, 0x48, 0xb8, 0x42, 0x2e, 0x88, 0x17, 0x31, - 0xf5, 0x53, 0x15, 0x6c, 0xb4, 0xd4, 0x39, 0xb3, 0xaa, 0x66, 0x56, 0xe5, 0x94, 0xc5, 0x05, 0xcb, - 0x67, 0xae, 0xcf, 0x4c, 0xc1, 0x5f, 0x91, 0x03, 0x29, 0xb7, 0x58, 0x6e, 0xfa, 0x4d, 0x5f, 0xd2, - 0xf9, 0x3f, 0x45, 0xbd, 0x37, 0x50, 0x2f, 0x3b, 0xc3, 0x21, 0xb1, 0x57, 0x42, 0xe2, 0xfa, 0x17, - 0xd8, 0x31, 0x43, 0x82, 0x99, 0xef, 0x29, 0x89, 0x37, 0x07, 0x4a, 0x24, 0x84, 0x8b, 0xd5, 0x15, - 0xcb, 0xf1, 0x4f, 0x46, 0xc2, 0x77, 0x4e, 0x0e, 0x48, 0x18, 0x90, 0xa8, 0x85, 0x1d, 0x25, 0xb1, - 0xfa, 0x52, 0x09, 0xd6, 0x3a, 0xc1, 0x96, 0xe5, 0xb7, 0xbc, 0x48, 0x8a, 0xe8, 0x7f, 0xd3, 0xe0, - 0xc6, 0x76, 0xcb, 0xb3, 0xa9, 0xd7, 0x3c, 0x0e, 0x6c, 0x1c, 0x91, 0x07, 0xab, 0xe8, 0x6b, 0x30, - 0x93, 0x20, 0x9b, 0xd4, 0xae, 0x68, 0x77, 0xb4, 0xbb, 0x05, 0x23, 0x9f, 0xd0, 0xea, 0x36, 0x7a, - 0x03, 0x4a, 0xa7, 0x52, 0xca, 0xbc, 0xc0, 0x4e, 0x8b, 0x98, 0x41, 0xe0, 0x56, 0x52, 0x77, 0xb4, - 0xbb, 0x93, 0xc6, 0x0d, 0xc5, 0x78, 0xc0, 0xe9, 0x8d, 0xc0, 0x45, 0x2e, 0x14, 0xe2, 0xb9, 0xc2, - 0xa4, 0x4a, 0xfa, 0x8e, 0x76, 0x77, 0xa6, 0xb6, 0xf3, 0xd9, 0x17, 0xb7, 0x27, 0xfe, 0xf9, 0xc5, - 0xed, 0x6f, 0x37, 0x69, 0x74, 0xd6, 0x3a, 0xa9, 0x5a, 0xbe, 0xbb, 0xd2, 0x65, 0xff, 0xc5, 0x3b, - 0x6f, 0x5b, 0x67, 0x98, 0x7a, 0xed, 0x05, 0xd8, 0xd1, 0x65, 0x40, 0x58, 0xf5, 0x90, 0x84, 0x14, - 0x3b, 0xf4, 0x29, 0x3e, 0x71, 0x48, 0xdd, 0x8b, 0x8c, 0x19, 0x05, 0x5f, 0xe7, 0xe8, 0xfa, 0xcf, - 0x53, 0x30, 0xab, 0x56, 0xb4, 0xc5, 0x03, 0xfb, 0x60, 0x15, 0xed, 0xc1, 0x54, 0x4b, 0x2c, 0x8e, - 0x55, 0xb4, 0x3b, 0xe9, 0xbb, 0xf9, 0xb5, 0xb7, 0xaa, 0x23, 0x12, 0xa1, 0xda, 0xe3, 0x8f, 0x5a, - 0x86, 0x5b, 0x6a, 0xc4, 0x10, 0x68, 0x13, 0x32, 0xdc, 0x0e, 0xb1, 0xdc, 0xd9, 0xb5, 0x7b, 0xe3, - 0x40, 0x29, 0x43, 0xaa, 0x47, 0x97, 0x01, 0x31, 0x84, 0xb4, 0xee, 0x42, 0x86, 0x8f, 0x50, 0x19, - 0x8a, 0x47, 0x9f, 0x34, 0xb6, 0xcc, 0xe3, 0x83, 0xc3, 0xc6, 0xd6, 0x46, 0x7d, 0xbb, 0xbe, 0xb5, - 0x59, 0x9c, 0x40, 0xb7, 0xe0, 0xa6, 0xa0, 0x36, 0x8c, 0xad, 0xfd, 0xfa, 0xf1, 0xbe, 0x79, 0xb8, - 0xbe, 0xdf, 0xd8, 0xdb, 0x2a, 0x6a, 0xe8, 0x36, 0x2c, 0x09, 0xc6, 0xf6, 0xf1, 0xc1, 0x66, 0xfd, - 0xe0, 0x03, 0xd3, 0x58, 0x3f, 0xda, 0x32, 0xd7, 0x0f, 0x36, 0xcd, 0xfa, 0xc1, 0xe6, 0xd6, 0xc7, - 0xc5, 0x14, 0x9a, 0x83, 0x52, 0x97, 0xe4, 0x83, 0xfb, 0x47, 0x5b, 0xc5, 0xb4, 0xfe, 0xd7, 0x14, - 0x14, 0xf6, 0x71, 0x78, 0x4e, 0xa2, 0xd8, 0x29, 0x4b, 0x30, 0xed, 0x0a, 0x42, 0x3b, 0xc4, 0x39, - 0x49, 0xa8, 0xdb, 0xe8, 0x21, 0xcc, 0x04, 0x21, 0xb5, 0x88, 0x29, 0x17, 0x2d, 0xd6, 0x9a, 0x5f, - 0x7b, 0x77, 0xe4, 0x5a, 0x25, 0x7c, 0x83, 0x8b, 0x49, 0xd7, 0x29, 0x4d, 0x3b, 0x13, 0x46, 0x3e, - 0x68, 0x53, 0xd1, 0x47, 0x50, 0x50, 0x8a, 0xad, 0x90, 0x70, 0xf0, 0xb4, 0x00, 0xbf, 0x37, 0x06, - 0xf8, 0x86, 0x10, 0x68, 0xe3, 0xce, 0xb8, 0x1d, 0xe4, 0x0e, 0x60, 0xd7, 0xb7, 0xe9, 0xe9, 0x65, - 0x25, 0x33, 0x36, 0xf0, 0xbe, 0x10, 0xe8, 0x03, 0x96, 0xe4, 0xda, 0x14, 0x4c, 0x8a, 0xd9, 0xfa, - 0x2e, 0x54, 0x86, 0xad, 0x12, 0x55, 0xe1, 0xa6, 0x74, 0xd9, 0x63, 0x1a, 0x9d, 0x99, 0xe4, 0x49, - 0xe0, 0x7b, 0xc4, 0x8b, 0x84, 0x67, 0x33, 0x46, 0x49, 0xb0, 0x3e, 0xa2, 0xd1, 0xd9, 0x96, 0x62, - 0xe8, 0x1f, 0x43, 0x49, 0x62, 0xd5, 0x30, 0x4b, 0x40, 0x10, 0x64, 0x02, 0x4c, 0x43, 0x21, 0x35, - 0x6d, 0x88, 0xff, 0x68, 0x05, 0xca, 0x2e, 0xf5, 0x4c, 0x09, 0x6e, 0x9d, 0x61, 0xaf, 0xd9, 0xde, - 0x6e, 0x05, 0xa3, 0xe4, 0x52, 0x4f, 0x58, 0xb3, 0x21, 0x38, 0x8d, 0xc0, 0xd5, 0x5b, 0x70, 0x73, - 0x80, 0xbb, 0x50, 0x0d, 0x32, 0x27, 0x98, 0x11, 0x81, 0x9d, 0x5f, 0xab, 0x8e, 0xe1, 0x95, 0x0e, - 0xcb, 0x0c, 0x21, 0x8b, 0x16, 0x21, 0x97, 0xac, 0x8c, 0xeb, 0x2f, 0x19, 0xc9, 0x58, 0xff, 0x24, - 0x56, 0xdb, 0xe5, 0xcc, 0xeb, 0x50, 0xab, 0xff, 0x5e, 0x83, 0xc2, 0xa1, 0xdf, 0x0a, 0x2d, 0x72, - 0xff, 0x94, 0x6f, 0x29, 0x86, 0xbe, 0x0b, 0x85, 0xf6, 0x59, 0x16, 0x67, 0xf0, 0xd0, 0x0c, 0x4d, - 0x08, 0x17, 0xab, 0xd5, 0xba, 0xa4, 0x1d, 0x26, 0xd2, 0x75, 0x9b, 0x07, 0x9c, 0x75, 0x8c, 0xd1, - 0x3b, 0x30, 0x85, 0x6d, 0x3b, 0x24, 0x8c, 0x89, 0x55, 0x4e, 0xd7, 0x2a, 0x7f, 0xff, 0xe3, 0xdb, - 0x65, 0x75, 0x25, 0xac, 0x4b, 0xce, 0x61, 0x14, 0x52, 0xaf, 0xb9, 0x33, 0x61, 0xc4, 0x53, 0x6b, - 0x39, 0xc8, 0x32, 0x61, 0xa4, 0xfe, 0xbb, 0x34, 0xdc, 0x38, 0x0a, 0xb1, 0xc7, 0x4e, 0x49, 0x18, - 0xfb, 0xa1, 0x09, 0x65, 0x46, 0x3c, 0x9b, 0x84, 0xe6, 0xf5, 0x19, 0x6e, 0x20, 0x09, 0xd9, 0x49, - 0x43, 0x2e, 0xdc, 0x0a, 0x89, 0x45, 0x03, 0x4a, 0xbc, 0xa8, 0x47, 0x57, 0xea, 0x2a, 0xba, 0xe6, - 0x12, 0xd4, 0x2e, 0x75, 0x0b, 0x90, 0xc3, 0x8c, 0xc9, 0x63, 0x24, 0x2d, 0x52, 0x72, 0x4a, 0x8c, - 0xeb, 0x36, 0x9a, 0x87, 0x2c, 0x76, 0xf9, 0x34, 0xb1, 0x13, 0x33, 0x86, 0x1a, 0xa1, 0x1a, 0x64, - 0xa5, 0xdd, 0x95, 0x49, 0x61, 0xd0, 0x1b, 0x23, 0x93, 0xa2, 0x2b, 0xf0, 0x86, 0x92, 0x44, 0x3b, - 0x30, 0x9d, 0xd8, 0x53, 0xc9, 0xbe, 0x32, 0x4c, 0x5b, 0x58, 0xff, 0x3c, 0x0d, 0xc5, 0xfb, 0xa1, - 0x4d, 0xc2, 0x6d, 0xea, 0x38, 0x71, 0xb4, 0x8e, 0x21, 0xef, 0xe2, 0x73, 0x12, 0x9a, 0x3e, 0xe7, - 0x8c, 0x4e, 0xde, 0x01, 0x8e, 0x13, 0x78, 0xea, 0xe2, 0x00, 0x01, 0x24, 0x28, 0x68, 0x1b, 0x26, - 0x25, 0x60, 0xea, 0x75, 0x00, 0x77, 0x26, 0x0c, 0x29, 0x8e, 0x3e, 0x85, 0x92, 0x43, 0x1f, 0xb5, - 0xa8, 0x8d, 0x23, 0xea, 0x7b, 0xca, 0x48, 0x79, 0xdc, 0xad, 0x8c, 0xf4, 0xc2, 0x5e, 0x5b, 0x4a, - 0x40, 0x8a, 0xd3, 0xae, 0xe8, 0xf4, 0x50, 0xd1, 0x6d, 0xc8, 0x9f, 0x52, 0xc7, 0x31, 0x55, 0xf8, - 0xd2, 0x22, 0x7c, 0xc0, 0x49, 0xeb, 0x32, 0x84, 0xe2, 0xf6, 0xe0, 0xfe, 0x39, 0x25, 0x44, 0x44, - 0x11, 0xf1, 0xdb, 0xe3, 0x9c, 0x84, 0xdb, 0x84, 0x70, 0x66, 0x94, 0x30, 0xb3, 0x92, 0x19, 0xc5, - 0xcc, 0xb7, 0x00, 0x45, 0x7e, 0x84, 0x1d, 0x93, 0xa3, 0x11, 0xdb, 0x14, 0x52, 0x95, 0x29, 0xa1, - 0xa1, 0x28, 0x38, 0xdb, 0x82, 0xb1, 0xcf, 0xe9, 0x7d, 0xb3, 0x05, 0x4c, 0x25, 0xd7, 0x37, 0xfb, - 0x88, 0xd3, 0x6b, 0x05, 0xc8, 0x47, 0xed, 0xa8, 0xe9, 0x3f, 0x49, 0xc3, 0xcd, 0x4d, 0xe2, 0x90, - 0x0b, 0x12, 0xe2, 0x66, 0x47, 0x3d, 0xf0, 0x1d, 0x80, 0x78, 0xc5, 0xe4, 0x6a, 0x1b, 0x30, 0x0e, - 0x71, 0x1b, 0x8e, 0x83, 0xfb, 0xa7, 0xa7, 0x8c, 0x44, 0x11, 0xf5, 0x9a, 0x57, 0xda, 0x71, 0x31, - 0x78, 0x1b, 0xae, 0xaf, 0x34, 0x4b, 0xf7, 0x97, 0x66, 0x3d, 0xa1, 0xcb, 0xf4, 0x85, 0xee, 0x1e, - 0x94, 0xa5, 0x4b, 0x1f, 0xb5, 0xfc, 0x88, 0x98, 0x8f, 0x5a, 0xd8, 0x8b, 0x5a, 0x2e, 0x13, 0x51, - 0xcc, 0x18, 0xd2, 0xdd, 0x1f, 0x72, 0xd6, 0x87, 0x8a, 0x83, 0xe6, 0x20, 0x4b, 0x99, 0x79, 0xd2, - 0xba, 0x14, 0xc1, 0xcc, 0x19, 0x93, 0x94, 0xd5, 0x5a, 0x97, 0xfc, 0xc6, 0xa3, 0xcc, 0x3c, 0xa5, - 0x1e, 0x76, 0x4c, 0x6e, 0xa0, 0x43, 0x5c, 0xbe, 0x19, 0xa7, 0xc4, 0x9c, 0x12, 0x65, 0xdb, 0x9c, - 0x73, 0x98, 0x30, 0xf4, 0x1f, 0xa7, 0x00, 0xf5, 0xe7, 0xdf, 0x97, 0x1b, 0x8d, 0x3b, 0x30, 0xc3, - 0x4b, 0x6a, 0x93, 0xdf, 0xa4, 0xf1, 0x09, 0x58, 0x30, 0x80, 0xd3, 0x1a, 0x98, 0x86, 0x75, 0x7b, - 0x1c, 0x97, 0x7e, 0x15, 0x40, 0x7a, 0x8c, 0xd1, 0xa7, 0x44, 0x79, 0x74, 0x5a, 0x50, 0x0e, 0xe9, - 0x53, 0xd2, 0xe1, 0x9e, 0xc9, 0x4e, 0xf7, 0x2c, 0x42, 0x8e, 0xb5, 0x4e, 0x22, 0x6a, 0x9d, 0x33, - 0xe1, 0xb7, 0x8c, 0x91, 0x8c, 0xf5, 0x7f, 0xa7, 0xe0, 0x56, 0xdb, 0xf2, 0xee, 0x42, 0xe2, 0xe1, - 0x75, 0x5e, 0x6d, 0x3d, 0x17, 0xdb, 0x53, 0x58, 0x92, 0x15, 0x9d, 0x6d, 0xb6, 0x17, 0x1d, 0xf8, - 0x8c, 0xf2, 0x80, 0xb0, 0x4a, 0x5a, 0x54, 0xc7, 0xef, 0x8f, 0xad, 0xa9, 0x11, 0x63, 0x34, 0x14, - 0x84, 0xb1, 0xa0, 0xe0, 0xfb, 0x38, 0x0c, 0x79, 0x70, 0x2b, 0xd6, 0x2d, 0x2f, 0x8c, 0xb6, 0xde, - 0x8c, 0xd0, 0xfb, 0xcd, 0xb1, 0xf5, 0xae, 0x73, 0xf9, 0x44, 0xe7, 0x9c, 0x82, 0xed, 0xa2, 0xb2, - 0xdd, 0x4c, 0x2e, 0x55, 0x4c, 0xeb, 0x9f, 0xcf, 0x40, 0xf9, 0x30, 0xc2, 0x11, 0x39, 0x6d, 0x39, - 0x22, 0xe3, 0x62, 0x37, 0xbb, 0x90, 0x17, 0xa7, 0x84, 0x19, 0x38, 0xd8, 0x8a, 0xcb, 0x93, 0xdd, - 0xd1, 0x57, 0xc8, 0x00, 0x9c, 0x6e, 0x62, 0x83, 0x63, 0xb9, 0x71, 0x15, 0x09, 0x7e, 0x42, 0x43, - 0x3e, 0x14, 0xa4, 0x3a, 0xf5, 0x30, 0x54, 0xa7, 0xf5, 0xce, 0x15, 0x15, 0x1a, 0x12, 0x4d, 0x16, - 0xad, 0x7e, 0x07, 0x05, 0xfd, 0x54, 0x83, 0x25, 0xcb, 0xf7, 0x6c, 0xe1, 0x0d, 0xec, 0x98, 0x1d, - 0x8b, 0x15, 0xdb, 0x54, 0x5e, 0xbd, 0xfb, 0xaf, 0xae, 0x7f, 0xa3, 0x0d, 0x3a, 0x60, 0xcd, 0x0b, - 0xd6, 0x30, 0xf6, 0x10, 0x8b, 0xa2, 0x90, 0x36, 0x9b, 0x24, 0x24, 0xb6, 0xba, 0xc5, 0xaf, 0xc1, - 0xa2, 0xa3, 0x18, 0x72, 0xb0, 0x45, 0x09, 0x1b, 0xfd, 0x48, 0x83, 0x05, 0xc7, 0xf7, 0x9a, 0x66, - 0x44, 0x42, 0xb7, 0xcf, 0x43, 0x53, 0xaf, 0x9b, 0x12, 0x7b, 0xbe, 0xd7, 0x3c, 0x22, 0xa1, 0x3b, - 0xc0, 0x3d, 0xf3, 0xce, 0x40, 0x1e, 0xfa, 0x3e, 0x94, 0xe2, 0xf4, 0x68, 0x1b, 0x90, 0x13, 0x06, - 0xec, 0x5d, 0xd1, 0x00, 0xa3, 0x8d, 0x28, 0x6f, 0x7b, 0xbf, 0x87, 0xba, 0xf8, 0x3d, 0xa8, 0x0c, - 0xcb, 0x62, 0xb4, 0x19, 0x57, 0x2c, 0xaf, 0x55, 0x02, 0xa9, 0x7a, 0x65, 0xf1, 0xcf, 0x1a, 0xcc, - 0x0f, 0xce, 0x5b, 0xf4, 0x10, 0x8a, 0x62, 0x4b, 0x10, 0x5b, 0x05, 0x20, 0x39, 0xf1, 0xee, 0xbd, - 0x9a, 0xae, 0xba, 0x6d, 0xcc, 0x2a, 0x24, 0x35, 0x46, 0x1f, 0x40, 0x56, 0xf6, 0x5f, 0xd4, 0x63, - 0x7d, 0x48, 0x6d, 0x24, 0x5b, 0x36, 0xd5, 0x4e, 0xc3, 0x0c, 0x21, 0x66, 0x28, 0xf1, 0x45, 0x0b, - 0x96, 0x46, 0xa4, 0xfd, 0x35, 0x39, 0xe9, 0x07, 0xfd, 0x4a, 0x3a, 0x32, 0x19, 0x7d, 0x0a, 0x28, - 0xd9, 0x2b, 0x57, 0x77, 0x55, 0x31, 0xc1, 0x52, 0x14, 0x9e, 0x05, 0xc3, 0x12, 0xf7, 0x9a, 0x16, - 0xf8, 0x27, 0x0d, 0x16, 0x87, 0xa7, 0x26, 0x32, 0x60, 0xc6, 0x77, 0xae, 0x61, 0x69, 0xe0, 0x3b, - 0x49, 0x06, 0x6c, 0x5e, 0xa9, 0xe0, 0x56, 0x86, 0x27, 0x0d, 0x00, 0x79, 0xa7, 0xec, 0x66, 0x72, - 0xe9, 0x62, 0x46, 0xff, 0x8d, 0x06, 0x48, 0x5c, 0x39, 0xdd, 0xcf, 0xec, 0x59, 0x48, 0x25, 0x0d, - 0x95, 0x14, 0x15, 0x8f, 0x20, 0x76, 0xe9, 0x9e, 0xf8, 0x8e, 0x7c, 0x4a, 0x1a, 0x6a, 0xc4, 0x8b, - 0x8a, 0x33, 0xcc, 0x4c, 0xd9, 0x68, 0x10, 0x55, 0x47, 0xce, 0x98, 0x3e, 0xc3, 0x4c, 0xbe, 0x81, - 0xbb, 0xdb, 0x33, 0x99, 0x9e, 0xf6, 0xcc, 0x9b, 0x50, 0xc2, 0x91, 0xef, 0x52, 0xcb, 0x0c, 0x09, - 0xf3, 0x9d, 0x16, 0xcf, 0x18, 0x71, 0xa0, 0x97, 0x8c, 0xa2, 0x64, 0x18, 0x09, 0x5d, 0xff, 0x4b, - 0x1a, 0xbe, 0x92, 0x5c, 0xc7, 0x83, 0x1a, 0x03, 0xbd, 0x16, 0xbf, 0xbc, 0x66, 0x9a, 0x87, 0x2c, - 0xaf, 0x63, 0x48, 0x28, 0xec, 0x9e, 0x36, 0xd4, 0x68, 0xb4, 0xd1, 0x3b, 0x90, 0x65, 0x11, 0x8e, - 0x5a, 0xb2, 0xd2, 0x9c, 0x1d, 0x27, 0xb0, 0x1b, 0x4a, 0xe5, 0xa1, 0x90, 0x33, 0x94, 0x3c, 0xfa, - 0x16, 0x2c, 0xa9, 0xaa, 0xd5, 0xb4, 0x7c, 0xef, 0x82, 0x84, 0x8c, 0x3f, 0x82, 0x92, 0xc6, 0x44, - 0x56, 0x38, 0x62, 0x41, 0x4d, 0xd9, 0x48, 0x66, 0xc4, 0xad, 0x97, 0xc1, 0xee, 0x9b, 0x1a, 0xec, - 0x3e, 0xf4, 0x06, 0x94, 0xe2, 0xb2, 0x8d, 0xd7, 0x4c, 0x26, 0xff, 0x27, 0x4e, 0xe6, 0x82, 0x71, - 0x23, 0x66, 0x34, 0x48, 0x78, 0x44, 0xad, 0x73, 0xfe, 0x5a, 0x61, 0x11, 0x09, 0xcc, 0x13, 0xcc, - 0x3a, 0x0a, 0xeb, 0x69, 0xf9, 0x5a, 0xe1, 0x9c, 0x1a, 0x66, 0xed, 0xb2, 0xfa, 0xeb, 0x30, 0x2b, - 0x2b, 0x55, 0x1a, 0x5d, 0x9a, 0x11, 0x25, 0x61, 0x05, 0x04, 0x6c, 0x21, 0xa1, 0x1e, 0x51, 0x12, - 0xbe, 0x9f, 0xaa, 0x68, 0xfa, 0x2f, 0x32, 0x23, 0x63, 0xb8, 0xf6, 0xff, 0x18, 0xfe, 0x57, 0xc7, - 0x10, 0x3d, 0x80, 0xbc, 0x72, 0xaa, 0x68, 0x1d, 0xe7, 0x85, 0xf3, 0xc6, 0xa8, 0xe8, 0x7b, 0x62, - 0x2e, 0xfa, 0xc7, 0xe0, 0x26, 0xff, 0xf5, 0x5f, 0xa7, 0x60, 0x71, 0xaf, 0x53, 0xd3, 0x71, 0xc0, - 0x48, 0x18, 0x0d, 0xdb, 0xd9, 0x08, 0x32, 0x1e, 0x76, 0x89, 0x3a, 0x89, 0xc4, 0x7f, 0xbe, 0x5e, - 0xea, 0xd1, 0x88, 0x62, 0x87, 0x9f, 0x45, 0x4d, 0xea, 0x89, 0xe6, 0xa2, 0x7c, 0x05, 0x15, 0x15, - 0x67, 0x5f, 0x30, 0x1a, 0x81, 0x8b, 0xde, 0x83, 0x8a, 0x8b, 0xa9, 0x17, 0x11, 0x0f, 0x7b, 0x16, - 0x31, 0x4f, 0x43, 0x6c, 0x89, 0x0e, 0x04, 0x97, 0x91, 0xc9, 0x32, 0xdf, 0xc1, 0xdf, 0x56, 0x6c, - 0x29, 0x39, 0x2f, 0x5c, 0x1a, 0x57, 0xfd, 0xa6, 0xe7, 0xcb, 0x8b, 0x4e, 0x3e, 0x3c, 0x6b, 0xa9, - 0x8a, 0x66, 0x94, 0xf9, 0x8c, 0xb8, 0x82, 0x3f, 0x50, 0xfc, 0xdd, 0x4c, 0x2e, 0x5b, 0x9c, 0xda, - 0xcd, 0xe4, 0xa6, 0x8a, 0x39, 0xe3, 0x96, 0x1f, 0x10, 0xcf, 0xe4, 0x0a, 0x42, 0xc2, 0x22, 0xd3, - 0xf1, 0x1f, 0x93, 0xd0, 0xb4, 0x70, 0xd0, 0xcb, 0x68, 0x05, 0x81, 0x64, 0xe8, 0xbf, 0x4a, 0xc1, - 0x9c, 0x7c, 0x60, 0xc5, 0x99, 0x18, 0x7b, 0xa7, 0x77, 0x8f, 0x68, 0x7d, 0x7b, 0xa4, 0x9d, 0xee, - 0xa9, 0x2f, 0x37, 0xdd, 0xd3, 0x2f, 0x4b, 0xf7, 0x81, 0x19, 0x9c, 0x79, 0x95, 0x0c, 0x9e, 0x1c, - 0x9c, 0xc1, 0xfa, 0x1f, 0x34, 0x98, 0x97, 0xfe, 0x49, 0x92, 0x6d, 0xc4, 0x55, 0xa6, 0x8e, 0x8c, - 0xd4, 0xf0, 0x23, 0x23, 0x3d, 0xce, 0x5d, 0x95, 0x19, 0xb2, 0x51, 0xfb, 0xb7, 0xd3, 0xe4, 0x80, - 0xed, 0xa4, 0x33, 0x98, 0x3b, 0x0a, 0xb1, 0x4d, 0xbd, 0xa6, 0x41, 0x1e, 0xe3, 0xd0, 0x66, 0xed, - 0xb7, 0xf3, 0x8d, 0x48, 0x32, 0xcc, 0x50, 0x72, 0xd4, 0x17, 0x9f, 0xd5, 0x91, 0x45, 0xb4, 0x6a, - 0xe9, 0x76, 0x61, 0x1a, 0xb3, 0x51, 0x97, 0x0a, 0xfd, 0x97, 0x1a, 0x94, 0x07, 0x4d, 0x44, 0x65, - 0x98, 0xf4, 0x1f, 0x7b, 0x24, 0xee, 0xda, 0xcb, 0x01, 0x3a, 0x87, 0x19, 0x9b, 0x78, 0xbe, 0x1b, - 0x37, 0x62, 0x52, 0xd7, 0xfc, 0xd5, 0x2b, 0x2f, 0xd0, 0x65, 0x4f, 0x47, 0xff, 0xa1, 0x06, 0x0b, - 0xf7, 0x03, 0xe2, 0xd5, 0x55, 0xfe, 0x77, 0x77, 0x14, 0x2c, 0x98, 0xeb, 0xdd, 0x1d, 0x9d, 0x5f, - 0xc3, 0x46, 0x77, 0x0c, 0xfb, 0x61, 0x8d, 0x9b, 0x7e, 0x1f, 0x8d, 0xe9, 0xbf, 0xd5, 0x00, 0xf5, - 0xcf, 0x1d, 0xe7, 0x63, 0xa2, 0x0b, 0x85, 0x2e, 0xf3, 0xae, 0xdd, 0x55, 0x33, 0x9d, 0xf6, 0xea, - 0xcf, 0x46, 0x9d, 0x99, 0x6b, 0xff, 0x1b, 0x67, 0x26, 0x7a, 0x17, 0x86, 0x9d, 0x94, 0xaa, 0x17, - 0x55, 0xee, 0xf4, 0xc9, 0x1e, 0x67, 0x6e, 0xe0, 0xa0, 0x5f, 0x2c, 0x39, 0x47, 0x55, 0x87, 0xb6, - 0xdc, 0x1d, 0xfa, 0x40, 0x88, 0xd5, 0x8c, 0xcf, 0x9e, 0x2f, 0x6b, 0xcf, 0x9e, 0x2f, 0x6b, 0xff, - 0x7a, 0xbe, 0xac, 0xfd, 0xec, 0xc5, 0xf2, 0xc4, 0xb3, 0x17, 0xcb, 0x13, 0xff, 0x78, 0xb1, 0x3c, - 0xf1, 0xf0, 0xbd, 0xf1, 0x83, 0xd7, 0xfd, 0xe1, 0xfe, 0x24, 0x2b, 0x18, 0xdf, 0xf8, 0x4f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xd3, 0x64, 0xcb, 0x95, 0xde, 0x1f, 0x00, 0x00, + 0x15, 0x4f, 0xdb, 0x1d, 0xc7, 0x79, 0x8e, 0x33, 0x76, 0x8d, 0x93, 0x71, 0x12, 0xc8, 0x0c, 0x2d, + 0x21, 0x8d, 0x66, 0x77, 0x9d, 0x49, 0xd8, 0x45, 0xab, 0x3d, 0x20, 0xe2, 0x7c, 0x6c, 0x1c, 0x25, + 0x19, 0x6f, 0xc7, 0x99, 0xdd, 0x1d, 0xd0, 0x36, 0x9d, 0xee, 0xb2, 0x53, 0x4a, 0x7f, 0x4d, 0x57, + 0x3b, 0x33, 0x19, 0x09, 0x89, 0x1b, 0x1c, 0x90, 0x40, 0x42, 0x1c, 0x38, 0x20, 0xc1, 0x01, 0x0e, + 0x48, 0x1c, 0x90, 0xb8, 0x72, 0x40, 0x5c, 0xf6, 0xc6, 0x88, 0x0b, 0x88, 0xc3, 0x0a, 0xcd, 0x1c, + 0xf8, 0x37, 0x50, 0x7d, 0x74, 0xfb, 0xdb, 0xe3, 0x99, 0x64, 0x25, 0x84, 0x38, 0xd9, 0xf5, 0x5e, + 0xbd, 0xdf, 0x7b, 0xf5, 0xde, 0xab, 0x7a, 0xaf, 0xaa, 0xe1, 0xae, 0x7d, 0x69, 0x3f, 0x0d, 0x42, + 0x3f, 0xf2, 0x2d, 0xdf, 0x59, 0x23, 0x9e, 0x8d, 0x9f, 0xe2, 0x70, 0x0d, 0x5f, 0x60, 0x2f, 0xa2, + 0xf2, 0xa7, 0xc2, 0xd9, 0x68, 0xa5, 0x7b, 0x66, 0x45, 0xce, 0xac, 0x88, 0x29, 0xcb, 0x4b, 0x96, + 0x4f, 0x5d, 0x9f, 0x1a, 0x9c, 0xbf, 0x26, 0x06, 0x42, 0x6e, 0xb9, 0xd4, 0xf2, 0x5b, 0xbe, 0xa0, + 0xb3, 0x7f, 0x92, 0x7a, 0x7f, 0xa8, 0x5e, 0x7a, 0x66, 0x86, 0xd8, 0x5e, 0x0b, 0xb1, 0xeb, 0x5f, + 0x98, 0x8e, 0x11, 0x62, 0x93, 0xfa, 0x9e, 0x94, 0x78, 0x6b, 0xa8, 0x44, 0x42, 0xb8, 0x58, 0x5f, + 0xb3, 0x1c, 0xff, 0x74, 0x2c, 0x7c, 0xf7, 0xe4, 0x00, 0x87, 0x01, 0x8e, 0xda, 0xa6, 0x23, 0x25, + 0xd6, 0x5f, 0x29, 0x41, 0xdb, 0xa7, 0xa6, 0x65, 0xf9, 0x6d, 0x2f, 0x12, 0x22, 0xda, 0x5f, 0x15, + 0xb8, 0xb1, 0xdb, 0xf6, 0x6c, 0xe2, 0xb5, 0x4e, 0x02, 0xdb, 0x8c, 0xf0, 0xc3, 0x75, 0xf4, 0x35, + 0x98, 0x4b, 0x90, 0x0d, 0x62, 0x97, 0x95, 0x3b, 0xca, 0xdd, 0xbc, 0x9e, 0x4b, 0x68, 0x35, 0x1b, + 0xdd, 0x83, 0x62, 0x53, 0x48, 0x19, 0x17, 0xa6, 0xd3, 0xc6, 0x46, 0x10, 0xb8, 0xe5, 0xd4, 0x1d, + 0xe5, 0xee, 0xb4, 0x7e, 0x43, 0x32, 0x1e, 0x32, 0x7a, 0x3d, 0x70, 0x91, 0x0b, 0xf9, 0x78, 0x2e, + 0x37, 0xa9, 0x9c, 0xbe, 0xa3, 0xdc, 0x9d, 0xab, 0xee, 0x7d, 0xfe, 0xc5, 0xed, 0xa9, 0x7f, 0x7e, + 0x71, 0xfb, 0xdb, 0x2d, 0x12, 0x9d, 0xb5, 0x4f, 0x2b, 0x96, 0xef, 0xae, 0xf5, 0xd8, 0x7f, 0xf1, + 0xee, 0x3b, 0xd6, 0x99, 0x49, 0xbc, 0xce, 0x02, 0xec, 0xe8, 0x32, 0xc0, 0xb4, 0x72, 0x8c, 0x43, + 0x62, 0x3a, 0xe4, 0x99, 0x79, 0xea, 0xe0, 0x9a, 0x17, 0xe9, 0x73, 0x12, 0xbe, 0xc6, 0xd0, 0xb5, + 0x9f, 0xa5, 0x60, 0x5e, 0xae, 0x68, 0x87, 0x05, 0xf6, 0xe1, 0x3a, 0x3a, 0x80, 0x99, 0x36, 0x5f, + 0x1c, 0x2d, 0x2b, 0x77, 0xd2, 0x77, 0x73, 0x1b, 0x6f, 0x57, 0xc6, 0x24, 0x42, 0xa5, 0xcf, 0x1f, + 0x55, 0x95, 0x59, 0xaa, 0xc7, 0x10, 0x68, 0x1b, 0x54, 0x66, 0x07, 0x5f, 0xee, 0xfc, 0xc6, 0xfd, + 0x49, 0xa0, 0xa4, 0x21, 0x95, 0xc6, 0x65, 0x80, 0x75, 0x2e, 0xad, 0xb9, 0xa0, 0xb2, 0x11, 0x2a, + 0x41, 0xa1, 0xf1, 0x69, 0x7d, 0xc7, 0x38, 0x39, 0x3a, 0xae, 0xef, 0x6c, 0xd5, 0x76, 0x6b, 0x3b, + 0xdb, 0x85, 0x29, 0x74, 0x0b, 0x6e, 0x72, 0x6a, 0x5d, 0xdf, 0x39, 0xac, 0x9d, 0x1c, 0x1a, 0xc7, + 0x9b, 0x87, 0xf5, 0x83, 0x9d, 0x82, 0x82, 0x6e, 0xc3, 0x0a, 0x67, 0xec, 0x9e, 0x1c, 0x6d, 0xd7, + 0x8e, 0x3e, 0x34, 0xf4, 0xcd, 0xc6, 0x8e, 0xb1, 0x79, 0xb4, 0x6d, 0xd4, 0x8e, 0xb6, 0x77, 0x3e, + 0x29, 0xa4, 0xd0, 0x02, 0x14, 0x7b, 0x24, 0x1f, 0x3e, 0x68, 0xec, 0x14, 0xd2, 0xda, 0x5f, 0x52, + 0x90, 0x3f, 0x34, 0xc3, 0x73, 0x1c, 0xc5, 0x4e, 0x59, 0x81, 0x59, 0x97, 0x13, 0x3a, 0x21, 0xce, + 0x0a, 0x42, 0xcd, 0x46, 0x8f, 0x60, 0x2e, 0x08, 0x89, 0x85, 0x0d, 0xb1, 0x68, 0xbe, 0xd6, 0xdc, + 0xc6, 0x7b, 0x63, 0xd7, 0x2a, 0xe0, 0xeb, 0x4c, 0x4c, 0xb8, 0x4e, 0x6a, 0xda, 0x9b, 0xd2, 0x73, + 0x41, 0x87, 0x8a, 0x3e, 0x86, 0xbc, 0x54, 0x6c, 0x85, 0x98, 0x81, 0xa7, 0x39, 0xf8, 0xfd, 0x09, + 0xc0, 0xb7, 0xb8, 0x40, 0x07, 0x77, 0xce, 0xed, 0x22, 0x77, 0x01, 0xbb, 0xbe, 0x4d, 0x9a, 0x97, + 0x65, 0x75, 0x62, 0xe0, 0x43, 0x2e, 0x30, 0x00, 0x2c, 0xc8, 0xd5, 0x19, 0x98, 0xe6, 0xb3, 0xb5, + 0x7d, 0x28, 0x8f, 0x5a, 0x25, 0xaa, 0xc0, 0x4d, 0xe1, 0xb2, 0x27, 0x24, 0x3a, 0x33, 0xf0, 0xd3, + 0xc0, 0xf7, 0xb0, 0x17, 0x71, 0xcf, 0xaa, 0x7a, 0x91, 0xb3, 0x3e, 0x26, 0xd1, 0xd9, 0x8e, 0x64, + 0x68, 0x9f, 0x40, 0x51, 0x60, 0x55, 0x4d, 0x9a, 0x80, 0x20, 0x50, 0x03, 0x93, 0x84, 0x5c, 0x6a, + 0x56, 0xe7, 0xff, 0xd1, 0x1a, 0x94, 0x5c, 0xe2, 0x19, 0x02, 0xdc, 0x3a, 0x33, 0xbd, 0x56, 0x67, + 0xbb, 0xe5, 0xf5, 0xa2, 0x4b, 0x3c, 0x6e, 0xcd, 0x16, 0xe7, 0xd4, 0x03, 0x57, 0x6b, 0xc3, 0xcd, + 0x21, 0xee, 0x42, 0x55, 0x50, 0x4f, 0x4d, 0x8a, 0x39, 0x76, 0x6e, 0xa3, 0x32, 0x81, 0x57, 0xba, + 0x2c, 0xd3, 0xb9, 0x2c, 0x5a, 0x86, 0x6c, 0xb2, 0x32, 0xa6, 0xbf, 0xa8, 0x27, 0x63, 0xed, 0xd3, + 0x58, 0x6d, 0x8f, 0x33, 0xaf, 0x43, 0xad, 0xf6, 0x7b, 0x05, 0xf2, 0xc7, 0x7e, 0x3b, 0xb4, 0xf0, + 0x83, 0x26, 0xdb, 0x52, 0x14, 0x7d, 0x17, 0xf2, 0x9d, 0xb3, 0x2c, 0xce, 0xe0, 0x91, 0x19, 0x9a, + 0x10, 0x2e, 0xd6, 0x2b, 0x35, 0x41, 0x3b, 0x4e, 0xa4, 0x6b, 0x36, 0x0b, 0x38, 0xed, 0x1a, 0xa3, + 0x77, 0x61, 0xc6, 0xb4, 0xed, 0x10, 0x53, 0xca, 0x57, 0x39, 0x5b, 0x2d, 0xff, 0xed, 0x8f, 0xef, + 0x94, 0x64, 0x49, 0xd8, 0x14, 0x9c, 0xe3, 0x28, 0x24, 0x5e, 0x6b, 0x6f, 0x4a, 0x8f, 0xa7, 0x56, + 0xb3, 0x90, 0xa1, 0xdc, 0x48, 0xed, 0x77, 0x69, 0xb8, 0xd1, 0x08, 0x4d, 0x8f, 0x36, 0x71, 0x18, + 0xfb, 0xa1, 0x05, 0x25, 0x8a, 0x3d, 0x1b, 0x87, 0xc6, 0xf5, 0x19, 0xae, 0x23, 0x01, 0xd9, 0x4d, + 0x43, 0x2e, 0xdc, 0x0a, 0xb1, 0x45, 0x02, 0x82, 0xbd, 0xa8, 0x4f, 0x57, 0xea, 0x2a, 0xba, 0x16, + 0x12, 0xd4, 0x1e, 0x75, 0x4b, 0x90, 0x35, 0x29, 0x15, 0xc7, 0x48, 0x9a, 0xa7, 0xe4, 0x0c, 0x1f, + 0xd7, 0x6c, 0xb4, 0x08, 0x19, 0xd3, 0x65, 0xd3, 0xf8, 0x4e, 0x54, 0x75, 0x39, 0x42, 0x55, 0xc8, + 0x08, 0xbb, 0xcb, 0xd3, 0xdc, 0xa0, 0x7b, 0x63, 0x93, 0xa2, 0x27, 0xf0, 0xba, 0x94, 0x44, 0x7b, + 0x30, 0x9b, 0xd8, 0x53, 0xce, 0xbc, 0x36, 0x4c, 0x47, 0x58, 0xfb, 0x7b, 0x1a, 0x0a, 0x0f, 0x42, + 0x1b, 0x87, 0xbb, 0xc4, 0x71, 0xe2, 0x68, 0x9d, 0x40, 0xce, 0x35, 0xcf, 0x71, 0x68, 0xf8, 0x8c, + 0x33, 0x3e, 0x79, 0x87, 0x38, 0x8e, 0xe3, 0xc9, 0xc2, 0x01, 0x1c, 0x88, 0x53, 0xd0, 0x2e, 0x4c, + 0x0b, 0xc0, 0xd4, 0x9b, 0x00, 0xee, 0x4d, 0xe9, 0x42, 0x1c, 0x7d, 0x06, 0x45, 0x87, 0x3c, 0x6e, + 0x13, 0xdb, 0x8c, 0x88, 0xef, 0x49, 0x23, 0xc5, 0x71, 0xb7, 0x36, 0xd6, 0x0b, 0x07, 0x1d, 0x29, + 0x0e, 0xc9, 0x4f, 0xbb, 0x82, 0xd3, 0x47, 0x45, 0xb7, 0x21, 0xd7, 0x24, 0x8e, 0x63, 0xc8, 0xf0, + 0xa5, 0x79, 0xf8, 0x80, 0x91, 0x36, 0x45, 0x08, 0x79, 0xf5, 0x60, 0xfe, 0x69, 0x62, 0xcc, 0xa3, + 0x88, 0x58, 0xf5, 0x38, 0xc7, 0xe1, 0x2e, 0xc6, 0x8c, 0x19, 0x25, 0xcc, 0x8c, 0x60, 0x46, 0x31, + 0xf3, 0x6d, 0x40, 0x91, 0x1f, 0x99, 0x8e, 0xc1, 0xd0, 0xb0, 0x6d, 0x70, 0xa9, 0xf2, 0x0c, 0xd7, + 0x50, 0xe0, 0x9c, 0x5d, 0xce, 0x38, 0x64, 0xf4, 0x81, 0xd9, 0x1c, 0xa6, 0x9c, 0x1d, 0x98, 0xdd, + 0x60, 0xf4, 0x6a, 0x1e, 0x72, 0x51, 0x27, 0x6a, 0xda, 0x8f, 0xd3, 0x70, 0x73, 0x1b, 0x3b, 0xf8, + 0x02, 0x87, 0x66, 0xab, 0xab, 0x1f, 0xf8, 0x0e, 0x40, 0xbc, 0x62, 0x7c, 0xb5, 0x0d, 0x18, 0x87, + 0xb8, 0x03, 0xc7, 0xc0, 0xfd, 0x66, 0x93, 0xe2, 0x28, 0x22, 0x5e, 0xeb, 0x4a, 0x3b, 0x2e, 0x06, + 0xef, 0xc0, 0x0d, 0xb4, 0x66, 0xe9, 0xc1, 0xd6, 0xac, 0x2f, 0x74, 0xea, 0x40, 0xe8, 0xee, 0x43, + 0x49, 0xb8, 0xf4, 0x71, 0xdb, 0x8f, 0xb0, 0xf1, 0xb8, 0x6d, 0x7a, 0x51, 0xdb, 0xa5, 0x3c, 0x8a, + 0xaa, 0x2e, 0xdc, 0xfd, 0x11, 0x63, 0x7d, 0x24, 0x39, 0x68, 0x01, 0x32, 0x84, 0x1a, 0xa7, 0xed, + 0x4b, 0x1e, 0xcc, 0xac, 0x3e, 0x4d, 0x68, 0xb5, 0x7d, 0xc9, 0x2a, 0x1e, 0xa1, 0x46, 0x93, 0x78, + 0xa6, 0x63, 0x30, 0x03, 0x1d, 0xec, 0xb2, 0xcd, 0x38, 0xc3, 0xe7, 0x14, 0x09, 0xdd, 0x65, 0x9c, + 0xe3, 0x84, 0xa1, 0xfd, 0x28, 0x05, 0x68, 0x30, 0xff, 0xbe, 0xdc, 0x68, 0xdc, 0x81, 0x39, 0xd6, + 0x52, 0x1b, 0xac, 0x92, 0xc6, 0x27, 0x60, 0x5e, 0x07, 0x46, 0xab, 0x9b, 0x24, 0xac, 0xd9, 0x93, + 0xb8, 0xf4, 0xab, 0x00, 0xc2, 0x63, 0x94, 0x3c, 0xc3, 0xd2, 0xa3, 0xb3, 0x9c, 0x72, 0x4c, 0x9e, + 0xe1, 0x2e, 0xf7, 0x4c, 0x77, 0xbb, 0x67, 0x19, 0xb2, 0xb4, 0x7d, 0x1a, 0x11, 0xeb, 0x9c, 0x72, + 0xbf, 0xa9, 0x7a, 0x32, 0xd6, 0xfe, 0x9d, 0x82, 0x5b, 0x1d, 0xcb, 0x7b, 0x1b, 0x89, 0x47, 0xd7, + 0x59, 0xda, 0xfa, 0x0a, 0xdb, 0x33, 0x58, 0x11, 0x1d, 0x9d, 0x6d, 0x74, 0x16, 0x1d, 0xf8, 0x94, + 0xb0, 0x80, 0xd0, 0x72, 0x9a, 0x77, 0xc7, 0x1f, 0x4c, 0xac, 0xa9, 0x1e, 0x63, 0xd4, 0x25, 0x84, + 0xbe, 0x24, 0xe1, 0x07, 0x38, 0x14, 0x79, 0x70, 0x2b, 0xd6, 0x2d, 0x0a, 0x46, 0x47, 0xaf, 0xca, + 0xf5, 0x7e, 0x73, 0x62, 0xbd, 0x9b, 0x4c, 0x3e, 0xd1, 0xb9, 0x20, 0x61, 0x7b, 0xa8, 0x74, 0x5f, + 0xcd, 0xa6, 0x0a, 0x69, 0xed, 0xd7, 0x00, 0xa5, 0xe3, 0xc8, 0x8c, 0x70, 0xb3, 0xed, 0xf0, 0x8c, + 0x8b, 0xdd, 0xec, 0x42, 0x8e, 0x9f, 0x12, 0x46, 0xe0, 0x98, 0x56, 0xdc, 0x9e, 0xec, 0x8f, 0x2f, + 0x21, 0x43, 0x70, 0x7a, 0x89, 0x75, 0x86, 0xe5, 0xc6, 0x5d, 0x24, 0xf8, 0x09, 0x0d, 0xf9, 0x90, + 0x17, 0xea, 0xe4, 0xc5, 0x50, 0x9e, 0xd6, 0x7b, 0x57, 0x54, 0xa8, 0x0b, 0x34, 0xd1, 0xb4, 0xfa, + 0x5d, 0x14, 0xf4, 0x13, 0x05, 0x56, 0x2c, 0xdf, 0xb3, 0xb9, 0x37, 0x4c, 0xc7, 0xe8, 0x5a, 0x2c, + 0xdf, 0xa6, 0xa2, 0xf4, 0x1e, 0xbe, 0xbe, 0xfe, 0xad, 0x0e, 0xe8, 0x90, 0x35, 0x2f, 0x59, 0xa3, + 0xd8, 0x23, 0x2c, 0x8a, 0x42, 0xd2, 0x6a, 0xe1, 0x10, 0xdb, 0xb2, 0x8a, 0x5f, 0x83, 0x45, 0x8d, + 0x18, 0x72, 0xb8, 0x45, 0x09, 0x1b, 0xfd, 0x50, 0x81, 0x25, 0xc7, 0xf7, 0x5a, 0x46, 0x84, 0x43, + 0x77, 0xc0, 0x43, 0x33, 0x6f, 0x9a, 0x12, 0x07, 0xbe, 0xd7, 0x6a, 0xe0, 0xd0, 0x1d, 0xe2, 0x9e, + 0x45, 0x67, 0x28, 0x6f, 0xf9, 0x7b, 0x50, 0x1e, 0x95, 0x48, 0x68, 0x3b, 0x6e, 0x1a, 0xde, 0xa8, + 0x0b, 0x91, 0x2d, 0xc3, 0xf2, 0x9f, 0x14, 0x58, 0x1c, 0x9e, 0x3a, 0xe8, 0x11, 0x14, 0x78, 0x56, + 0x62, 0x5b, 0xfa, 0x20, 0x39, 0x74, 0xee, 0xbf, 0x9e, 0xae, 0x9a, 0xad, 0xcf, 0x4b, 0x24, 0x39, + 0x46, 0x1f, 0x42, 0x46, 0x3c, 0x81, 0xc8, 0xfb, 0xf2, 0x88, 0xf6, 0x44, 0xbc, 0x9a, 0x54, 0xba, + 0x0d, 0xd3, 0xb9, 0x98, 0x2e, 0xc5, 0x97, 0x2d, 0x58, 0x19, 0x93, 0x79, 0xd7, 0xe4, 0xa4, 0xef, + 0x0f, 0x2a, 0xe9, 0x4a, 0x26, 0xf4, 0x19, 0xa0, 0x24, 0x5d, 0xaf, 0xee, 0xaa, 0x42, 0x82, 0x25, + 0x29, 0x2c, 0x0b, 0x46, 0xe5, 0xce, 0xf5, 0x2c, 0x30, 0xb9, 0xca, 0x8a, 0xd3, 0x71, 0x5f, 0xcd, + 0xa6, 0x0b, 0xaa, 0xf6, 0x1b, 0x05, 0x10, 0x3f, 0x3c, 0x7b, 0x2f, 0x8c, 0xf3, 0x90, 0x4a, 0x9e, + 0x06, 0x52, 0x84, 0xb7, 0xf3, 0xf4, 0xd2, 0x3d, 0xf5, 0x1d, 0x71, 0x29, 0xd2, 0xe5, 0x88, 0x95, + 0xc7, 0x33, 0x93, 0x1a, 0xe2, 0xca, 0xcc, 0xeb, 0x67, 0x56, 0x9f, 0x3d, 0x33, 0xa9, 0xb8, 0xcd, + 0xf5, 0x3e, 0x34, 0xa8, 0x7d, 0x0f, 0x0d, 0x6f, 0x41, 0xd1, 0x8c, 0x7c, 0x97, 0x58, 0x46, 0x88, + 0xa9, 0xef, 0xb4, 0x99, 0xe3, 0xf9, 0xd1, 0x54, 0xd4, 0x0b, 0x82, 0xa1, 0x27, 0x74, 0xed, 0xcf, + 0x69, 0xf8, 0x4a, 0x52, 0x58, 0x86, 0x5d, 0x71, 0xfb, 0x2d, 0x7e, 0x75, 0xf5, 0x5f, 0x84, 0x0c, + 0xab, 0xc8, 0x38, 0xe4, 0x76, 0xcf, 0xea, 0x72, 0x34, 0xde, 0xe8, 0x3d, 0xc8, 0xd0, 0xc8, 0x8c, + 0xda, 0xa2, 0x67, 0x9a, 0x9f, 0x24, 0xf4, 0x5b, 0x52, 0xe5, 0x31, 0x97, 0xd3, 0xa5, 0x3c, 0xfa, + 0x16, 0xac, 0xc8, 0xfe, 0xcb, 0xb0, 0x7c, 0xef, 0x02, 0x87, 0x94, 0xb5, 0xf3, 0xc9, 0x15, 0x3b, + 0xc3, 0x1d, 0xb1, 0x24, 0xa7, 0x6c, 0x25, 0x33, 0xe2, 0x47, 0x84, 0xe1, 0xee, 0x9b, 0x19, 0xee, + 0x3e, 0x74, 0x0f, 0x8a, 0x71, 0x03, 0xc2, 0xaa, 0xbf, 0xc1, 0xfe, 0xf1, 0x56, 0x3a, 0xaf, 0xdf, + 0x88, 0x19, 0x75, 0x1c, 0x36, 0x88, 0x75, 0xce, 0xfa, 0x6e, 0x1a, 0xe1, 0xc0, 0x60, 0xd7, 0xef, + 0x4e, 0x8b, 0x38, 0x2b, 0xfa, 0x6e, 0xc6, 0x61, 0x97, 0xf4, 0xa4, 0x41, 0xfc, 0x3a, 0xcc, 0x8b, + 0x9e, 0x8b, 0x44, 0x97, 0x46, 0x44, 0x70, 0x58, 0x06, 0x0e, 0x9b, 0x4f, 0xa8, 0x0d, 0x82, 0xc3, + 0x0f, 0x52, 0x65, 0x45, 0xfb, 0xb9, 0x3a, 0x36, 0x86, 0x1b, 0xff, 0x8f, 0xe1, 0x7f, 0x75, 0x0c, + 0xd1, 0x43, 0x76, 0x31, 0xe6, 0x4e, 0xe5, 0x8f, 0xa0, 0x39, 0xee, 0xbc, 0x09, 0x7a, 0xd3, 0xbe, + 0x98, 0xf3, 0x97, 0x50, 0x70, 0x93, 0xff, 0xda, 0xaf, 0x52, 0xb0, 0x7c, 0xd0, 0xad, 0xe9, 0x24, + 0xa0, 0x38, 0x8c, 0x46, 0xed, 0x6c, 0x04, 0xaa, 0x67, 0xba, 0x58, 0x9e, 0x44, 0xfc, 0x3f, 0x5b, + 0x2f, 0xf1, 0x48, 0x44, 0x4c, 0x87, 0x9d, 0x45, 0x2d, 0xe2, 0xf1, 0x67, 0x32, 0xd1, 0xcf, 0x17, + 0x24, 0xe7, 0x90, 0x33, 0xea, 0x81, 0x8b, 0xde, 0x87, 0xb2, 0x6b, 0x12, 0x2f, 0xc2, 0x9e, 0xe9, + 0x59, 0xd8, 0x68, 0x86, 0xa6, 0xc5, 0xef, 0xd2, 0x4c, 0x46, 0x24, 0xcb, 0x62, 0x17, 0x7f, 0x57, + 0xb2, 0x85, 0xe4, 0x22, 0x77, 0x69, 0xdc, 0xbf, 0x1a, 0x9e, 0x2f, 0xea, 0x85, 0xb8, 0x42, 0x55, + 0x53, 0x65, 0x45, 0x2f, 0xb1, 0x19, 0x71, 0x2f, 0x7a, 0x24, 0xf9, 0xfb, 0x6a, 0x36, 0x53, 0x98, + 0xd9, 0x57, 0xb3, 0x33, 0x85, 0xac, 0x7e, 0xcb, 0x0f, 0xb0, 0x67, 0x30, 0x05, 0x21, 0xa6, 0x91, + 0xe1, 0xf8, 0x4f, 0x70, 0x68, 0x58, 0x66, 0xd0, 0xcf, 0x68, 0x07, 0x81, 0x60, 0x68, 0xbf, 0x4c, + 0xc1, 0x82, 0xb8, 0x2a, 0xc4, 0x99, 0x18, 0x7b, 0xa7, 0x7f, 0x8f, 0x28, 0x03, 0x7b, 0xa4, 0x93, + 0xee, 0xa9, 0x2f, 0x37, 0xdd, 0xd3, 0xaf, 0x4a, 0xf7, 0xa1, 0x19, 0xac, 0xbe, 0x4e, 0x06, 0x4f, + 0x0f, 0xcf, 0x60, 0xed, 0x0f, 0x0a, 0x2c, 0x0a, 0xff, 0x24, 0xc9, 0x36, 0xa6, 0x94, 0xc9, 0x23, + 0x23, 0x35, 0xfa, 0xc8, 0x48, 0x4f, 0x52, 0xab, 0xd4, 0x11, 0x1b, 0x75, 0x70, 0x3b, 0x4d, 0x0f, + 0xd9, 0x4e, 0x1a, 0x85, 0x85, 0x46, 0x68, 0xda, 0xc4, 0x6b, 0xe9, 0xf8, 0x89, 0x19, 0xda, 0xb4, + 0x73, 0x0b, 0xbc, 0x11, 0x09, 0x86, 0x11, 0x0a, 0x8e, 0xfc, 0x76, 0xb1, 0x3e, 0xb6, 0x1f, 0x95, + 0x8f, 0x93, 0x3d, 0x98, 0xfa, 0x7c, 0xd4, 0xa3, 0x42, 0xfb, 0x85, 0x02, 0xa5, 0x61, 0x13, 0x51, + 0x09, 0xa6, 0xfd, 0x27, 0x1e, 0x8e, 0xdf, 0x9f, 0xc5, 0x00, 0x9d, 0xc3, 0x9c, 0x8d, 0x3d, 0xdf, + 0x8d, 0x9f, 0x14, 0x52, 0xd7, 0xfc, 0xfd, 0x26, 0xc7, 0xd1, 0xc5, 0xeb, 0x84, 0xf6, 0x03, 0x05, + 0x96, 0x1e, 0x04, 0xd8, 0xab, 0xc9, 0xfc, 0xef, 0xbd, 0x1b, 0x5b, 0xb0, 0xd0, 0xbf, 0x3b, 0xba, + 0xbf, 0xeb, 0x8c, 0x7f, 0xfb, 0x1a, 0x84, 0xd5, 0x6f, 0xfa, 0x03, 0x34, 0xaa, 0xfd, 0x56, 0x01, + 0x34, 0x38, 0x77, 0x92, 0xcf, 0x62, 0x2e, 0xe4, 0x7b, 0xcc, 0xbb, 0x76, 0x57, 0xcd, 0x75, 0xdb, + 0xab, 0x3d, 0x1f, 0x77, 0x66, 0x6e, 0xfc, 0x6f, 0x9c, 0x99, 0xe8, 0x3d, 0x18, 0x75, 0x52, 0xca, + 0x57, 0x95, 0x52, 0xb7, 0x4f, 0x0e, 0x18, 0x73, 0xcb, 0x0c, 0x06, 0xc5, 0x92, 0x73, 0x54, 0xbe, + 0x35, 0x96, 0x7a, 0x43, 0x1f, 0x70, 0xb1, 0xaa, 0xfe, 0xf9, 0x8b, 0x55, 0xe5, 0xf9, 0x8b, 0x55, + 0xe5, 0x5f, 0x2f, 0x56, 0x95, 0x9f, 0xbe, 0x5c, 0x9d, 0x7a, 0xfe, 0x72, 0x75, 0xea, 0x1f, 0x2f, + 0x57, 0xa7, 0x1e, 0xbd, 0x3f, 0x79, 0xf0, 0x7a, 0x3f, 0x41, 0x9f, 0x66, 0x38, 0xe3, 0x1b, 0xff, + 0x09, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xa3, 0x08, 0x2d, 0xa8, 0x1e, 0x00, 0x00, } func (m *FundingUpdateV1) Marshal() (dAtA []byte, err error) { @@ -3643,27 +3569,6 @@ func (m *StatefulOrderEventV1_LongTermOrderPlacement) MarshalToSizedBuffer(dAtA } return len(dAtA) - i, nil } -func (m *StatefulOrderEventV1_OrderReplacement) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StatefulOrderEventV1_OrderReplacement) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.OrderReplacement != nil { - { - size, err := m.OrderReplacement.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } - return len(dAtA) - i, nil -} func (m *StatefulOrderEventV1_StatefulOrderPlacementV1) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3844,53 +3749,6 @@ func (m *StatefulOrderEventV1_LongTermOrderPlacementV1) MarshalToSizedBuffer(dAt return len(dAtA) - i, nil } -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) 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 *StatefulOrderEventV1_LongTermOrderReplacementV1) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) 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 = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.OldOrderId != nil { - { - size, err := m.OldOrderId.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *AssetCreateEventV1) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4884,18 +4742,6 @@ func (m *StatefulOrderEventV1_LongTermOrderPlacement) Size() (n int) { } return n } -func (m *StatefulOrderEventV1_OrderReplacement) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.OrderReplacement != nil { - l = m.OrderReplacement.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} func (m *StatefulOrderEventV1_StatefulOrderPlacementV1) Size() (n int) { if m == nil { return 0 @@ -4964,23 +4810,6 @@ func (m *StatefulOrderEventV1_LongTermOrderPlacementV1) Size() (n int) { return n } -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.OldOrderId != nil { - l = m.OldOrderId.Size() - n += 1 + l + sovEvents(uint64(l)) - } - if m.Order != nil { - l = m.Order.Size() - n += 1 + l + sovEvents(uint64(l)) - } - return n -} - func (m *AssetCreateEventV1) Size() (n int) { if m == nil { return 0 @@ -7371,41 +7200,6 @@ func (m *StatefulOrderEventV1) Unmarshal(dAtA []byte) error { } m.Event = &StatefulOrderEventV1_LongTermOrderPlacement{v} iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderReplacement", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &StatefulOrderEventV1_LongTermOrderReplacementV1{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Event = &StatefulOrderEventV1_OrderReplacement{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipEvents(dAtA[iNdEx:]) @@ -7876,128 +7670,6 @@ func (m *StatefulOrderEventV1_LongTermOrderPlacementV1) Unmarshal(dAtA []byte) e } return nil } -func (m *StatefulOrderEventV1_LongTermOrderReplacementV1) 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 ErrIntOverflowEvents - } - 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: LongTermOrderReplacementV1: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: LongTermOrderReplacementV1: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OldOrderId", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.OldOrderId == nil { - m.OldOrderId = &types.IndexerOrderId{} - } - if err := m.OldOrderId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Order", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowEvents - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthEvents - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthEvents - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Order == nil { - m.Order = &types.IndexerOrder{} - } - if err := m.Order.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipEvents(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthEvents - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *AssetCreateEventV1) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/protocol/indexer/events/stateful_order.go b/protocol/indexer/events/stateful_order.go index d5cc0c537d..f1a0d029db 100644 --- a/protocol/indexer/events/stateful_order.go +++ b/protocol/indexer/events/stateful_order.go @@ -20,23 +20,6 @@ func NewLongTermOrderPlacementEvent( } } -func NewLongTermOrderReplacementEvent( - oldOrderId clobtypes.OrderId, - order clobtypes.Order, -) *StatefulOrderEventV1 { - oldIndexerOrderId := v1.OrderIdToIndexerOrderId(oldOrderId) - indexerOrder := v1.OrderToIndexerOrder(order) - orderReplace := StatefulOrderEventV1_LongTermOrderReplacementV1{ - OldOrderId: &oldIndexerOrderId, - Order: &indexerOrder, - } - return &StatefulOrderEventV1{ - Event: &StatefulOrderEventV1_OrderReplacement{ - OrderReplacement: &orderReplace, - }, - } -} - func NewStatefulOrderRemovalEvent( removedOrderId clobtypes.OrderId, reason sharedtypes.OrderRemovalReason, diff --git a/protocol/indexer/off_chain_updates/types/off_chain_updates.pb.go b/protocol/indexer/off_chain_updates/types/off_chain_updates.pb.go index a10262e6b3..b2dddf6dd2 100644 --- a/protocol/indexer/off_chain_updates/types/off_chain_updates.pb.go +++ b/protocol/indexer/off_chain_updates/types/off_chain_updates.pb.go @@ -5,23 +5,18 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" types "github.com/dydxprotocol/v4-chain/protocol/indexer/protocol/v1/types" - types2 "github.com/dydxprotocol/v4-chain/protocol/indexer/shared/types" + types1 "github.com/dydxprotocol/v4-chain/protocol/indexer/shared/types" io "io" math "math" math_bits "math/bits" - time "time" ) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf -var _ = time.Kitchen // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -127,8 +122,6 @@ func (OrderRemoveV1_OrderRemovalStatus) EnumDescriptor() ([]byte, []int) { type OrderPlaceV1 struct { Order *types.IndexerOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order,omitempty"` PlacementStatus OrderPlaceV1_OrderPlacementStatus `protobuf:"varint,2,opt,name=placement_status,json=placementStatus,proto3,enum=dydxprotocol.indexer.off_chain_updates.OrderPlaceV1_OrderPlacementStatus" json:"placement_status,omitempty"` - // The timestamp of the order placement. - TimeStamp *time.Time `protobuf:"bytes,3,opt,name=time_stamp,json=timeStamp,proto3,stdtime" json:"time_stamp,omitempty"` } func (m *OrderPlaceV1) Reset() { *m = OrderPlaceV1{} } @@ -178,21 +171,12 @@ func (m *OrderPlaceV1) GetPlacementStatus() OrderPlaceV1_OrderPlacementStatus { return OrderPlaceV1_ORDER_PLACEMENT_STATUS_UNSPECIFIED } -func (m *OrderPlaceV1) GetTimeStamp() *time.Time { - if m != nil { - return m.TimeStamp - } - return nil -} - // OrderRemove messages contain the id of the order removed, the reason for the // removal and the resulting status from the removal. type OrderRemoveV1 struct { RemovedOrderId *types.IndexerOrderId `protobuf:"bytes,1,opt,name=removed_order_id,json=removedOrderId,proto3" json:"removed_order_id,omitempty"` - Reason types2.OrderRemovalReason `protobuf:"varint,2,opt,name=reason,proto3,enum=dydxprotocol.indexer.shared.OrderRemovalReason" json:"reason,omitempty"` + Reason types1.OrderRemovalReason `protobuf:"varint,2,opt,name=reason,proto3,enum=dydxprotocol.indexer.shared.OrderRemovalReason" json:"reason,omitempty"` RemovalStatus OrderRemoveV1_OrderRemovalStatus `protobuf:"varint,3,opt,name=removal_status,json=removalStatus,proto3,enum=dydxprotocol.indexer.off_chain_updates.OrderRemoveV1_OrderRemovalStatus" json:"removal_status,omitempty"` - // The timestamp of the order removal. - TimeStamp *time.Time `protobuf:"bytes,4,opt,name=time_stamp,json=timeStamp,proto3,stdtime" json:"time_stamp,omitempty"` } func (m *OrderRemoveV1) Reset() { *m = OrderRemoveV1{} } @@ -235,11 +219,11 @@ func (m *OrderRemoveV1) GetRemovedOrderId() *types.IndexerOrderId { return nil } -func (m *OrderRemoveV1) GetReason() types2.OrderRemovalReason { +func (m *OrderRemoveV1) GetReason() types1.OrderRemovalReason { if m != nil { return m.Reason } - return types2.OrderRemovalReason_ORDER_REMOVAL_REASON_UNSPECIFIED + return types1.OrderRemovalReason_ORDER_REMOVAL_REASON_UNSPECIFIED } func (m *OrderRemoveV1) GetRemovalStatus() OrderRemoveV1_OrderRemovalStatus { @@ -249,13 +233,6 @@ func (m *OrderRemoveV1) GetRemovalStatus() OrderRemoveV1_OrderRemovalStatus { return OrderRemoveV1_ORDER_REMOVAL_STATUS_UNSPECIFIED } -func (m *OrderRemoveV1) GetTimeStamp() *time.Time { - if m != nil { - return m.TimeStamp - } - return nil -} - // OrderUpdate messages contain the id of the order being updated, and the // updated total filled quantums of the order. type OrderUpdateV1 struct { @@ -310,87 +287,15 @@ func (m *OrderUpdateV1) GetTotalFilledQuantums() uint64 { return 0 } -// OrderReplace messages contain the old order ID and the replacement order. -type OrderReplaceV1 struct { - OldOrderId *types.IndexerOrderId `protobuf:"bytes,1,opt,name=old_order_id,json=oldOrderId,proto3" json:"old_order_id,omitempty"` - Order *types.IndexerOrder `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` - PlacementStatus OrderPlaceV1_OrderPlacementStatus `protobuf:"varint,3,opt,name=placement_status,json=placementStatus,proto3,enum=dydxprotocol.indexer.off_chain_updates.OrderPlaceV1_OrderPlacementStatus" json:"placement_status,omitempty"` - TimeStamp *time.Time `protobuf:"bytes,4,opt,name=time_stamp,json=timeStamp,proto3,stdtime" json:"time_stamp,omitempty"` -} - -func (m *OrderReplaceV1) Reset() { *m = OrderReplaceV1{} } -func (m *OrderReplaceV1) String() string { return proto.CompactTextString(m) } -func (*OrderReplaceV1) ProtoMessage() {} -func (*OrderReplaceV1) Descriptor() ([]byte, []int) { - return fileDescriptor_a3058c1b66f59e98, []int{3} -} -func (m *OrderReplaceV1) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OrderReplaceV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OrderReplaceV1.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 *OrderReplaceV1) XXX_Merge(src proto.Message) { - xxx_messageInfo_OrderReplaceV1.Merge(m, src) -} -func (m *OrderReplaceV1) XXX_Size() int { - return m.Size() -} -func (m *OrderReplaceV1) XXX_DiscardUnknown() { - xxx_messageInfo_OrderReplaceV1.DiscardUnknown(m) -} - -var xxx_messageInfo_OrderReplaceV1 proto.InternalMessageInfo - -func (m *OrderReplaceV1) GetOldOrderId() *types.IndexerOrderId { - if m != nil { - return m.OldOrderId - } - return nil -} - -func (m *OrderReplaceV1) GetOrder() *types.IndexerOrder { - if m != nil { - return m.Order - } - return nil -} - -func (m *OrderReplaceV1) GetPlacementStatus() OrderPlaceV1_OrderPlacementStatus { - if m != nil { - return m.PlacementStatus - } - return OrderPlaceV1_ORDER_PLACEMENT_STATUS_UNSPECIFIED -} - -func (m *OrderReplaceV1) GetTimeStamp() *time.Time { - if m != nil { - return m.TimeStamp - } - return nil -} - // An OffChainUpdate message is the message type which will be sent on Kafka to // the Indexer. type OffChainUpdateV1 struct { - // Contains one of an OrderPlaceV1, OrderRemoveV1, OrderUpdateV1, and - // OrderReplaceV1 message. + // Contains one of an OrderPlaceV1, OrderRemoveV1, and OrderUpdateV1 message. // // Types that are valid to be assigned to UpdateMessage: - // // *OffChainUpdateV1_OrderPlace // *OffChainUpdateV1_OrderRemove // *OffChainUpdateV1_OrderUpdate - // *OffChainUpdateV1_OrderReplace UpdateMessage isOffChainUpdateV1_UpdateMessage `protobuf_oneof:"update_message"` } @@ -398,7 +303,7 @@ func (m *OffChainUpdateV1) Reset() { *m = OffChainUpdateV1{} } func (m *OffChainUpdateV1) String() string { return proto.CompactTextString(m) } func (*OffChainUpdateV1) ProtoMessage() {} func (*OffChainUpdateV1) Descriptor() ([]byte, []int) { - return fileDescriptor_a3058c1b66f59e98, []int{4} + return fileDescriptor_a3058c1b66f59e98, []int{3} } func (m *OffChainUpdateV1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -442,14 +347,10 @@ type OffChainUpdateV1_OrderRemove struct { type OffChainUpdateV1_OrderUpdate struct { OrderUpdate *OrderUpdateV1 `protobuf:"bytes,3,opt,name=order_update,json=orderUpdate,proto3,oneof" json:"order_update,omitempty"` } -type OffChainUpdateV1_OrderReplace struct { - OrderReplace *OrderReplaceV1 `protobuf:"bytes,4,opt,name=order_replace,json=orderReplace,proto3,oneof" json:"order_replace,omitempty"` -} -func (*OffChainUpdateV1_OrderPlace) isOffChainUpdateV1_UpdateMessage() {} -func (*OffChainUpdateV1_OrderRemove) isOffChainUpdateV1_UpdateMessage() {} -func (*OffChainUpdateV1_OrderUpdate) isOffChainUpdateV1_UpdateMessage() {} -func (*OffChainUpdateV1_OrderReplace) isOffChainUpdateV1_UpdateMessage() {} +func (*OffChainUpdateV1_OrderPlace) isOffChainUpdateV1_UpdateMessage() {} +func (*OffChainUpdateV1_OrderRemove) isOffChainUpdateV1_UpdateMessage() {} +func (*OffChainUpdateV1_OrderUpdate) isOffChainUpdateV1_UpdateMessage() {} func (m *OffChainUpdateV1) GetUpdateMessage() isOffChainUpdateV1_UpdateMessage { if m != nil { @@ -479,20 +380,12 @@ func (m *OffChainUpdateV1) GetOrderUpdate() *OrderUpdateV1 { return nil } -func (m *OffChainUpdateV1) GetOrderReplace() *OrderReplaceV1 { - if x, ok := m.GetUpdateMessage().(*OffChainUpdateV1_OrderReplace); ok { - return x.OrderReplace - } - return nil -} - // XXX_OneofWrappers is for the internal use of the proto package. func (*OffChainUpdateV1) XXX_OneofWrappers() []interface{} { return []interface{}{ (*OffChainUpdateV1_OrderPlace)(nil), (*OffChainUpdateV1_OrderRemove)(nil), (*OffChainUpdateV1_OrderUpdate)(nil), - (*OffChainUpdateV1_OrderReplace)(nil), } } @@ -502,7 +395,6 @@ func init() { proto.RegisterType((*OrderPlaceV1)(nil), "dydxprotocol.indexer.off_chain_updates.OrderPlaceV1") proto.RegisterType((*OrderRemoveV1)(nil), "dydxprotocol.indexer.off_chain_updates.OrderRemoveV1") proto.RegisterType((*OrderUpdateV1)(nil), "dydxprotocol.indexer.off_chain_updates.OrderUpdateV1") - proto.RegisterType((*OrderReplaceV1)(nil), "dydxprotocol.indexer.off_chain_updates.OrderReplaceV1") proto.RegisterType((*OffChainUpdateV1)(nil), "dydxprotocol.indexer.off_chain_updates.OffChainUpdateV1") } @@ -511,55 +403,47 @@ func init() { } var fileDescriptor_a3058c1b66f59e98 = []byte{ - // 756 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdf, 0x4f, 0x1a, 0x4b, - 0x14, 0x66, 0xc1, 0xeb, 0xf5, 0x1e, 0x91, 0x4b, 0xe6, 0x7a, 0x13, 0x63, 0x53, 0xb0, 0xa4, 0x31, - 0x36, 0x8d, 0xbb, 0x62, 0x6d, 0x1f, 0x9b, 0xf0, 0x63, 0xa9, 0xa4, 0x08, 0x74, 0x40, 0x9b, 0x98, - 0x34, 0x93, 0x85, 0x1d, 0x90, 0x64, 0x61, 0xb6, 0xbb, 0x0b, 0xd1, 0xff, 0xc2, 0x87, 0x3e, 0xf5, - 0xb1, 0xef, 0xfd, 0x3f, 0x7c, 0xf4, 0xb1, 0x4f, 0x6d, 0xa3, 0xe9, 0xff, 0xd1, 0xec, 0xcc, 0xb0, - 0x82, 0x62, 0x2a, 0xd4, 0xf4, 0x8d, 0x39, 0xf3, 0x9d, 0x6f, 0xce, 0xf9, 0xce, 0xb7, 0x47, 0xe1, - 0xa5, 0x79, 0x62, 0x1e, 0xdb, 0x0e, 0xf3, 0x58, 0x93, 0x59, 0x5a, 0xa7, 0x67, 0xd2, 0x63, 0xea, - 0x68, 0xac, 0xd5, 0x22, 0xcd, 0x23, 0xa3, 0xd3, 0x23, 0x7d, 0xdb, 0x34, 0x3c, 0xea, 0xde, 0x8c, - 0xa8, 0x3c, 0x09, 0xad, 0x8f, 0xe6, 0xab, 0x32, 0x5f, 0xbd, 0x81, 0x5e, 0xdd, 0x9a, 0xf8, 0x8e, - 0x7b, 0x64, 0x38, 0xd4, 0xd4, 0x1c, 0xda, 0x65, 0x03, 0xc3, 0x22, 0x0e, 0x35, 0x5c, 0xd6, 0x13, - 0xcc, 0xab, 0x4f, 0x27, 0x66, 0x04, 0x81, 0x41, 0x5a, 0x6b, 0x5a, 0xac, 0x21, 0xc1, 0xc9, 0x36, - 0x63, 0x6d, 0x8b, 0x8a, 0xeb, 0x46, 0xbf, 0xa5, 0x79, 0x9d, 0x2e, 0x75, 0x3d, 0xa3, 0x6b, 0x4b, - 0xc0, 0x72, 0x9b, 0xb5, 0x19, 0xff, 0xa9, 0xf9, 0xbf, 0x44, 0x34, 0xf5, 0x29, 0x02, 0xd1, 0x8a, - 0x63, 0x52, 0xa7, 0x6a, 0x19, 0x4d, 0x7a, 0x90, 0x46, 0x79, 0xf8, 0x8b, 0xf9, 0xe7, 0x15, 0x65, - 0x4d, 0xd9, 0x58, 0xdc, 0x56, 0xd5, 0x89, 0xed, 0x05, 0x81, 0x41, 0x5a, 0x2d, 0x8a, 0x18, 0x67, - 0xc1, 0x22, 0x19, 0x79, 0x10, 0xb7, 0x7d, 0xc2, 0x2e, 0xed, 0x79, 0xc4, 0xf5, 0x0c, 0xaf, 0xef, - 0xae, 0x84, 0xd7, 0x94, 0x8d, 0xd8, 0x76, 0x51, 0xbd, 0x9b, 0x5e, 0xea, 0x68, 0x55, 0x23, 0x07, - 0x9f, 0xb1, 0xc6, 0x09, 0xf1, 0xbf, 0xf6, 0x78, 0x00, 0xe5, 0x00, 0xfc, 0xae, 0x09, 0x6f, 0x7b, - 0x25, 0xc2, 0x1b, 0x58, 0x55, 0x85, 0x30, 0xea, 0x50, 0x18, 0xb5, 0x3e, 0x14, 0x26, 0xbb, 0x70, - 0xf6, 0x35, 0xa9, 0x9c, 0x7e, 0x4b, 0x2a, 0xf8, 0x1f, 0x3f, 0xaf, 0xe6, 0x07, 0x53, 0xa7, 0x0a, - 0x2c, 0x4f, 0x7a, 0x0e, 0xad, 0x43, 0xaa, 0x82, 0xf3, 0x3a, 0x26, 0xd5, 0x52, 0x26, 0xa7, 0xef, - 0xe9, 0xe5, 0x3a, 0xa9, 0xd5, 0x33, 0xf5, 0xfd, 0x1a, 0xd9, 0x2f, 0xd7, 0xaa, 0x7a, 0xae, 0x58, - 0x28, 0xea, 0xf9, 0x78, 0x08, 0x6d, 0xc2, 0x93, 0x5b, 0x70, 0x59, 0xbd, 0x56, 0x27, 0x7a, 0xa1, - 0x50, 0xc1, 0x75, 0x52, 0xa9, 0xea, 0x65, 0x3d, 0x1f, 0x57, 0xd0, 0x23, 0x78, 0x78, 0x0b, 0x5c, - 0x42, 0xc2, 0xa9, 0x8f, 0x73, 0xb0, 0x24, 0xe4, 0xf5, 0x6d, 0xe2, 0x4f, 0xe9, 0x10, 0xe2, 0xdc, - 0x32, 0xd4, 0x24, 0x5c, 0x70, 0xd2, 0x31, 0xe5, 0xc0, 0xb6, 0xa6, 0x1b, 0x58, 0xd1, 0xc4, 0x31, - 0xc9, 0x24, 0xcf, 0xe8, 0x15, 0xcc, 0x0b, 0x1b, 0xca, 0x89, 0x69, 0x93, 0x19, 0x85, 0x73, 0xd5, - 0xab, 0xba, 0x0c, 0x0b, 0xf3, 0x34, 0x2c, 0xd3, 0x11, 0x83, 0xd8, 0xd0, 0xd7, 0xd2, 0x02, 0x11, - 0x4e, 0xb8, 0x3b, 0x95, 0x05, 0x86, 0x3d, 0x8f, 0xbd, 0x24, 0x1d, 0xb0, 0xe4, 0x8c, 0x1e, 0xaf, - 0xcd, 0x7f, 0x6e, 0xb6, 0xf9, 0x7f, 0x56, 0x00, 0xdd, 0x7c, 0x0a, 0x3d, 0x86, 0x35, 0x31, 0x26, - 0xac, 0xef, 0x55, 0x0e, 0x32, 0xa5, 0x5f, 0xcc, 0xfe, 0x1a, 0x6a, 0x74, 0xf2, 0xb9, 0x4c, 0x39, - 0xa7, 0x97, 0xc6, 0x67, 0x7f, 0x0d, 0x1e, 0x40, 0xc2, 0x28, 0x09, 0x0f, 0x26, 0x42, 0x0a, 0xc5, - 0x92, 0x0f, 0x88, 0xf8, 0x7e, 0x15, 0xe6, 0xd8, 0xe7, 0xaa, 0x1d, 0xa4, 0xd1, 0x6b, 0x58, 0xf8, - 0x6d, 0x53, 0xfc, 0xcd, 0xa4, 0x1b, 0xb6, 0xe1, 0x7f, 0x8f, 0x79, 0x86, 0x45, 0x5a, 0x1d, 0xcb, - 0xa2, 0x26, 0x79, 0xdf, 0x37, 0x7a, 0x5e, 0xbf, 0x2b, 0x3e, 0xe7, 0x39, 0xfc, 0x1f, 0xbf, 0x2c, - 0xf0, 0xbb, 0x37, 0xf2, 0x2a, 0xf5, 0x23, 0x0c, 0x31, 0x29, 0xa1, 0x2d, 0xd7, 0x0a, 0x86, 0x28, - 0xb3, 0xee, 0xc1, 0xac, 0xc0, 0xac, 0xc0, 0xa8, 0xc1, 0xaa, 0x0a, 0xdf, 0xf7, 0xaa, 0x8a, 0xfc, - 0xe1, 0x55, 0x35, 0xa3, 0x55, 0x3f, 0x44, 0x20, 0x5e, 0x69, 0xb5, 0x72, 0x7e, 0x31, 0xc1, 0xf4, - 0xdf, 0xc2, 0xa2, 0x50, 0x99, 0x3f, 0x29, 0x85, 0xde, 0x99, 0xa5, 0x95, 0xdd, 0x10, 0x06, 0x16, - 0x9c, 0xd1, 0x21, 0x44, 0x05, 0xb1, 0xd8, 0x17, 0x52, 0xf5, 0xe7, 0x33, 0x7d, 0xcc, 0xbb, 0x21, - 0x2c, 0xaa, 0x14, 0x81, 0x2b, 0x6e, 0x81, 0x96, 0xbb, 0x7b, 0x3a, 0xee, 0xa1, 0x02, 0x01, 0xb7, - 0x08, 0xa0, 0x77, 0xb0, 0x34, 0xac, 0x5b, 0x48, 0x22, 0xd4, 0x7e, 0x31, 0x65, 0xe1, 0x76, 0x20, - 0x4a, 0x94, 0x8d, 0x44, 0xb2, 0x71, 0x88, 0x09, 0x24, 0xe9, 0x52, 0xd7, 0x35, 0xda, 0x34, 0xdb, - 0x3c, 0xbb, 0x48, 0x28, 0xe7, 0x17, 0x09, 0xe5, 0xfb, 0x45, 0x42, 0x39, 0xbd, 0x4c, 0x84, 0xce, - 0x2f, 0x13, 0xa1, 0x2f, 0x97, 0x89, 0xd0, 0x61, 0xb1, 0xdd, 0xf1, 0x8e, 0xfa, 0x0d, 0xb5, 0xc9, - 0xba, 0xda, 0xd8, 0x1f, 0xf7, 0xc1, 0xce, 0x26, 0x7f, 0x54, 0xbb, 0xc3, 0x3f, 0x22, 0xde, 0x89, - 0x4d, 0xdd, 0xc6, 0x3c, 0x47, 0x3e, 0xfb, 0x19, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x4c, 0xe4, 0xe6, - 0xbf, 0x08, 0x00, 0x00, + // 626 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xc1, 0x6e, 0xda, 0x4a, + 0x14, 0xb5, 0xc9, 0x7b, 0x69, 0x35, 0x49, 0xa8, 0x35, 0x6d, 0xa5, 0x28, 0x55, 0xdd, 0xd4, 0xaa, + 0xa2, 0x54, 0x55, 0xec, 0x40, 0xd3, 0x6d, 0x25, 0x02, 0xa6, 0xb1, 0x4a, 0x30, 0x1d, 0x48, 0x2a, + 0xb1, 0x19, 0x19, 0x7b, 0x08, 0x48, 0x86, 0xa1, 0xb6, 0x41, 0xc9, 0x5f, 0xe4, 0x47, 0xba, 0xec, + 0x3f, 0x74, 0x99, 0x4d, 0xa5, 0x6e, 0x2a, 0x55, 0xf0, 0x23, 0x95, 0x67, 0x06, 0x07, 0x82, 0xa3, + 0x86, 0x74, 0x79, 0xaf, 0xcf, 0x3d, 0x73, 0xe6, 0x9c, 0x3b, 0x00, 0xde, 0x7b, 0x17, 0xde, 0xf9, + 0x20, 0xa0, 0x11, 0x75, 0xa9, 0x6f, 0x74, 0xfb, 0x1e, 0x39, 0x27, 0x81, 0x41, 0xdb, 0x6d, 0xec, + 0x76, 0x9c, 0x6e, 0x1f, 0x0f, 0x07, 0x9e, 0x13, 0x91, 0x70, 0xb1, 0xa3, 0xb3, 0x21, 0xb8, 0x33, + 0x3b, 0xaf, 0x8b, 0x79, 0x7d, 0x01, 0xbd, 0xb5, 0x9f, 0x7a, 0x4e, 0xd8, 0x71, 0x02, 0xe2, 0x19, + 0x01, 0xe9, 0xd1, 0x91, 0xe3, 0xe3, 0x80, 0x38, 0x21, 0xed, 0x73, 0xe6, 0xad, 0x37, 0xa9, 0x13, + 0x49, 0x63, 0x94, 0x33, 0x5c, 0x9f, 0xb6, 0x38, 0x58, 0xfb, 0x95, 0x01, 0xeb, 0x76, 0xe0, 0x91, + 0xa0, 0xe6, 0x3b, 0x2e, 0x39, 0xcd, 0xc1, 0x12, 0xf8, 0x9f, 0xc6, 0xf5, 0xa6, 0xbc, 0x2d, 0xef, + 0xae, 0xe5, 0x75, 0x3d, 0x55, 0x67, 0xd2, 0x18, 0xe5, 0x74, 0x8b, 0xf7, 0x18, 0x0b, 0xe2, 0xc3, + 0x30, 0x02, 0xca, 0x20, 0x26, 0xec, 0x91, 0x7e, 0x84, 0xc3, 0xc8, 0x89, 0x86, 0xe1, 0x66, 0x66, + 0x5b, 0xde, 0xcd, 0xe6, 0x2d, 0xfd, 0x6e, 0x17, 0xd7, 0x67, 0x55, 0xcd, 0x14, 0x31, 0x63, 0x9d, + 0x11, 0xa2, 0x47, 0x83, 0xf9, 0x86, 0x76, 0x29, 0x83, 0x27, 0x69, 0x48, 0xb8, 0x03, 0x34, 0x1b, + 0x95, 0x4c, 0x84, 0x6b, 0x95, 0x42, 0xd1, 0x3c, 0x36, 0xab, 0x0d, 0x5c, 0x6f, 0x14, 0x1a, 0x27, + 0x75, 0x7c, 0x52, 0xad, 0xd7, 0xcc, 0xa2, 0x55, 0xb6, 0xcc, 0x92, 0x22, 0xc1, 0x3d, 0xf0, 0xfa, + 0x16, 0xdc, 0xa1, 0x59, 0x6f, 0x60, 0xb3, 0x5c, 0xb6, 0x51, 0x03, 0xdb, 0x35, 0xb3, 0x6a, 0x96, + 0x14, 0x19, 0xbe, 0x04, 0xcf, 0x6f, 0x81, 0x0b, 0x48, 0x46, 0xfb, 0xb1, 0x02, 0x36, 0xb8, 0x33, + 0x71, 0x54, 0xb1, 0xc1, 0x4d, 0xa0, 0xb0, 0xd8, 0x88, 0x87, 0x99, 0x57, 0xb8, 0xeb, 0x09, 0xaf, + 0xf7, 0x97, 0xf3, 0xda, 0xf2, 0x50, 0x56, 0x30, 0x89, 0x1a, 0x7e, 0x00, 0xab, 0x7c, 0x15, 0x84, + 0xd9, 0x46, 0x3a, 0x23, 0xdf, 0x1e, 0xfd, 0x5a, 0x97, 0xe3, 0x23, 0x36, 0x86, 0xc4, 0x38, 0xa4, + 0x20, 0x3b, 0xdd, 0x2d, 0x91, 0xde, 0x0a, 0x23, 0x3c, 0x5a, 0x2a, 0xbd, 0xe9, 0x9d, 0xe7, 0x4e, + 0x12, 0xe1, 0x6d, 0x04, 0xb3, 0xa5, 0xf6, 0x55, 0x06, 0x70, 0x11, 0x05, 0x5f, 0x81, 0x6d, 0xee, + 0x30, 0x32, 0x8f, 0xed, 0xd3, 0x42, 0xe5, 0x2f, 0xb1, 0xdd, 0x40, 0xcd, 0x86, 0x56, 0x2c, 0x54, + 0x8b, 0x66, 0x65, 0x3e, 0xb6, 0x1b, 0xf0, 0x04, 0x92, 0x81, 0x2f, 0xc0, 0xb3, 0x54, 0x48, 0xd9, + 0xaa, 0xc4, 0x80, 0x95, 0x78, 0xd5, 0x78, 0xae, 0x27, 0xec, 0xc2, 0xa7, 0x39, 0xf8, 0x11, 0x3c, + 0xfc, 0xe7, 0x3c, 0x1f, 0x50, 0x11, 0x64, 0x1e, 0x3c, 0x8d, 0x68, 0xe4, 0xf8, 0xb8, 0xdd, 0xf5, + 0x7d, 0xe2, 0xe1, 0x2f, 0x43, 0xa7, 0x1f, 0x0d, 0x7b, 0xfc, 0x11, 0xfd, 0x87, 0x1e, 0xb3, 0x8f, + 0x65, 0xf6, 0xed, 0x93, 0xf8, 0xa4, 0x7d, 0xcb, 0x00, 0xc5, 0x6e, 0xb7, 0x8b, 0x71, 0x0e, 0x89, + 0xaa, 0xcf, 0x60, 0x8d, 0xab, 0x62, 0x6f, 0x45, 0x08, 0x3b, 0xb8, 0xcf, 0x1b, 0x3c, 0x92, 0x10, + 0xa0, 0x49, 0x0d, 0x9b, 0x60, 0x9d, 0x13, 0xf3, 0x15, 0x64, 0xc2, 0xd6, 0xf2, 0xef, 0xee, 0xb5, + 0x1f, 0x47, 0x12, 0xe2, 0x2a, 0x79, 0xe3, 0x9a, 0x9b, 0xa3, 0xd9, 0xee, 0x2d, 0xcb, 0x3d, 0x75, + 0x20, 0xe1, 0xe6, 0x8d, 0x43, 0x05, 0x64, 0x39, 0x0e, 0xf7, 0x48, 0x18, 0x3a, 0x67, 0xe4, 0xd0, + 0xfd, 0x3e, 0x56, 0xe5, 0xab, 0xb1, 0x2a, 0xff, 0x1e, 0xab, 0xf2, 0xe5, 0x44, 0x95, 0xae, 0x26, + 0xaa, 0xf4, 0x73, 0xa2, 0x4a, 0x4d, 0xeb, 0xac, 0x1b, 0x75, 0x86, 0x2d, 0xdd, 0xa5, 0x3d, 0x63, + 0xee, 0x47, 0x75, 0x74, 0xb0, 0xc7, 0x8e, 0x34, 0xee, 0xf0, 0x07, 0x10, 0x5d, 0x0c, 0x48, 0xd8, + 0x5a, 0x65, 0xc8, 0xb7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x93, 0x06, 0x17, 0x37, 0x06, + 0x00, 0x00, } func (m *OrderPlaceV1) Marshal() (dAtA []byte, err error) { @@ -582,16 +466,6 @@ func (m *OrderPlaceV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.TimeStamp != nil { - n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.TimeStamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.TimeStamp):]) - if err1 != nil { - return 0, err1 - } - i -= n1 - i = encodeVarintOffChainUpdates(dAtA, i, uint64(n1)) - i-- - dAtA[i] = 0x1a - } if m.PlacementStatus != 0 { i = encodeVarintOffChainUpdates(dAtA, i, uint64(m.PlacementStatus)) i-- @@ -632,16 +506,6 @@ func (m *OrderRemoveV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.TimeStamp != nil { - n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.TimeStamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.TimeStamp):]) - if err3 != nil { - return 0, err3 - } - i -= n3 - i = encodeVarintOffChainUpdates(dAtA, i, uint64(n3)) - i-- - dAtA[i] = 0x22 - } if m.RemovalStatus != 0 { i = encodeVarintOffChainUpdates(dAtA, i, uint64(m.RemovalStatus)) i-- @@ -707,68 +571,6 @@ func (m *OrderUpdateV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *OrderReplaceV1) 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 *OrderReplaceV1) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OrderReplaceV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.TimeStamp != nil { - n6, err6 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.TimeStamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.TimeStamp):]) - if err6 != nil { - return 0, err6 - } - i -= n6 - i = encodeVarintOffChainUpdates(dAtA, i, uint64(n6)) - i-- - dAtA[i] = 0x22 - } - if m.PlacementStatus != 0 { - i = encodeVarintOffChainUpdates(dAtA, i, uint64(m.PlacementStatus)) - i-- - dAtA[i] = 0x18 - } - if m.Order != nil { - { - size, err := m.Order.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOffChainUpdates(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.OldOrderId != nil { - { - size, err := m.OldOrderId.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOffChainUpdates(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *OffChainUpdateV1) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -864,27 +666,6 @@ func (m *OffChainUpdateV1_OrderUpdate) MarshalToSizedBuffer(dAtA []byte) (int, e } return len(dAtA) - i, nil } -func (m *OffChainUpdateV1_OrderReplace) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OffChainUpdateV1_OrderReplace) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.OrderReplace != nil { - { - size, err := m.OrderReplace.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOffChainUpdates(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - return len(dAtA) - i, nil -} func encodeVarintOffChainUpdates(dAtA []byte, offset int, v uint64) int { offset -= sovOffChainUpdates(v) base := offset @@ -909,10 +690,6 @@ func (m *OrderPlaceV1) Size() (n int) { if m.PlacementStatus != 0 { n += 1 + sovOffChainUpdates(uint64(m.PlacementStatus)) } - if m.TimeStamp != nil { - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.TimeStamp) - n += 1 + l + sovOffChainUpdates(uint64(l)) - } return n } @@ -932,10 +709,6 @@ func (m *OrderRemoveV1) Size() (n int) { if m.RemovalStatus != 0 { n += 1 + sovOffChainUpdates(uint64(m.RemovalStatus)) } - if m.TimeStamp != nil { - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.TimeStamp) - n += 1 + l + sovOffChainUpdates(uint64(l)) - } return n } @@ -955,30 +728,6 @@ func (m *OrderUpdateV1) Size() (n int) { return n } -func (m *OrderReplaceV1) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.OldOrderId != nil { - l = m.OldOrderId.Size() - n += 1 + l + sovOffChainUpdates(uint64(l)) - } - if m.Order != nil { - l = m.Order.Size() - n += 1 + l + sovOffChainUpdates(uint64(l)) - } - if m.PlacementStatus != 0 { - n += 1 + sovOffChainUpdates(uint64(m.PlacementStatus)) - } - if m.TimeStamp != nil { - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.TimeStamp) - n += 1 + l + sovOffChainUpdates(uint64(l)) - } - return n -} - func (m *OffChainUpdateV1) Size() (n int) { if m == nil { return 0 @@ -1027,18 +776,6 @@ func (m *OffChainUpdateV1_OrderUpdate) Size() (n int) { } return n } -func (m *OffChainUpdateV1_OrderReplace) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.OrderReplace != nil { - l = m.OrderReplace.Size() - n += 1 + l + sovOffChainUpdates(uint64(l)) - } - return n -} func sovOffChainUpdates(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 @@ -1130,42 +867,6 @@ func (m *OrderPlaceV1) Unmarshal(dAtA []byte) error { break } } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeStamp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOffChainUpdates - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOffChainUpdates - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TimeStamp == nil { - m.TimeStamp = new(time.Time) - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.TimeStamp, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOffChainUpdates(dAtA[iNdEx:]) @@ -1266,7 +967,7 @@ func (m *OrderRemoveV1) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Reason |= types2.OrderRemovalReason(b&0x7F) << shift + m.Reason |= types1.OrderRemovalReason(b&0x7F) << shift if b < 0x80 { break } @@ -1290,42 +991,6 @@ func (m *OrderRemoveV1) Unmarshal(dAtA []byte) error { break } } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeStamp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOffChainUpdates - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOffChainUpdates - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TimeStamp == nil { - m.TimeStamp = new(time.Time) - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.TimeStamp, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOffChainUpdates(dAtA[iNdEx:]) @@ -1452,183 +1117,6 @@ func (m *OrderUpdateV1) Unmarshal(dAtA []byte) error { } return nil } -func (m *OrderReplaceV1) 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 ErrIntOverflowOffChainUpdates - } - 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: OrderReplaceV1: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OrderReplaceV1: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OldOrderId", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOffChainUpdates - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOffChainUpdates - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.OldOrderId == nil { - m.OldOrderId = &types.IndexerOrderId{} - } - if err := m.OldOrderId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Order", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOffChainUpdates - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOffChainUpdates - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Order == nil { - m.Order = &types.IndexerOrder{} - } - if err := m.Order.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PlacementStatus", wireType) - } - m.PlacementStatus = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.PlacementStatus |= OrderPlaceV1_OrderPlacementStatus(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeStamp", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOffChainUpdates - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOffChainUpdates - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TimeStamp == nil { - m.TimeStamp = new(time.Time) - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.TimeStamp, dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipOffChainUpdates(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthOffChainUpdates - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *OffChainUpdateV1) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1763,41 +1251,6 @@ func (m *OffChainUpdateV1) Unmarshal(dAtA []byte) error { } m.UpdateMessage = &OffChainUpdateV1_OrderUpdate{v} iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderReplace", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOffChainUpdates - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthOffChainUpdates - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthOffChainUpdates - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &OrderReplaceV1{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.UpdateMessage = &OffChainUpdateV1_OrderReplace{v} - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOffChainUpdates(dAtA[iNdEx:]) diff --git a/protocol/mocks/ClobKeeper.go b/protocol/mocks/ClobKeeper.go index c45d843acb..44e0e938f5 100644 --- a/protocol/mocks/ClobKeeper.go +++ b/protocol/mocks/ClobKeeper.go @@ -626,16 +626,16 @@ func (_m *ClobKeeper) GetSubaccountMaxNotionalLiquidatable(ctx types.Context, su } // HandleMsgCancelOrder provides a mock function with given fields: ctx, msg -func (_m *ClobKeeper) HandleMsgCancelOrder(ctx types.Context, msg *clobtypes.MsgCancelOrder, isInternalOrder bool) error { - ret := _m.Called(ctx, msg, isInternalOrder) +func (_m *ClobKeeper) HandleMsgCancelOrder(ctx types.Context, msg *clobtypes.MsgCancelOrder) error { + ret := _m.Called(ctx, msg) if len(ret) == 0 { panic("no return value specified for HandleMsgCancelOrder") } var r0 error - if rf, ok := ret.Get(0).(func(types.Context, *clobtypes.MsgCancelOrder, bool) error); ok { - r0 = rf(ctx, msg, isInternalOrder) + if rf, ok := ret.Get(0).(func(types.Context, *clobtypes.MsgCancelOrder) error); ok { + r0 = rf(ctx, msg) } else { r0 = ret.Error(0) } diff --git a/protocol/testutil/keeper/vault.go b/protocol/testutil/keeper/vault.go index 5a82da7a61..cbcc87e5d6 100644 --- a/protocol/testutil/keeper/vault.go +++ b/protocol/testutil/keeper/vault.go @@ -58,7 +58,6 @@ func createVaultKeeper( &mocks.PricesKeeper{}, &mocks.SendingKeeper{}, &mocks.SubaccountsKeeper{}, - &mocks.IndexerEventManager{}, []string{ lib.GovModuleAddress.String(), delaymsgtypes.ModuleAddress.String(), diff --git a/protocol/x/clob/keeper/msg_server_cancel_orders.go b/protocol/x/clob/keeper/msg_server_cancel_orders.go index 02610fd93d..b5165d4bc1 100644 --- a/protocol/x/clob/keeper/msg_server_cancel_orders.go +++ b/protocol/x/clob/keeper/msg_server_cancel_orders.go @@ -23,7 +23,7 @@ func (k msgServer) CancelOrder( ) (resp *types.MsgCancelOrderResponse, err error) { ctx := lib.UnwrapSDKContext(goCtx, types.ModuleName) - if err := k.Keeper.HandleMsgCancelOrder(ctx, msg, false); err != nil { + if err := k.Keeper.HandleMsgCancelOrder(ctx, msg); err != nil { return nil, err } @@ -37,7 +37,6 @@ func (k msgServer) CancelOrder( func (k Keeper) HandleMsgCancelOrder( ctx sdk.Context, msg *types.MsgCancelOrder, - isInternalOrder bool, ) (err error) { lib.AssertDeliverTxMode(ctx) @@ -111,19 +110,17 @@ func (k Keeper) HandleMsgCancelOrder( k.MustSetProcessProposerMatchesEvents(ctx, processProposerMatchesEvents) // 4. Add the relevant on-chain Indexer event for the cancellation. - if !isInternalOrder { // vault order indexer event logic is handled elsewhere - k.GetIndexerEventManager().AddTxnEvent( - ctx, - indexerevents.SubtypeStatefulOrder, - indexerevents.StatefulOrderEventVersion, - indexer_manager.GetBytes( - indexerevents.NewStatefulOrderRemovalEvent( - msg.OrderId, - indexershared.OrderRemovalReason_ORDER_REMOVAL_REASON_USER_CANCELED, - ), + k.GetIndexerEventManager().AddTxnEvent( + ctx, + indexerevents.SubtypeStatefulOrder, + indexerevents.StatefulOrderEventVersion, + indexer_manager.GetBytes( + indexerevents.NewStatefulOrderRemovalEvent( + msg.OrderId, + indexershared.OrderRemovalReason_ORDER_REMOVAL_REASON_USER_CANCELED, ), - ) - } + ), + ) return nil } diff --git a/protocol/x/clob/keeper/msg_server_place_order.go b/protocol/x/clob/keeper/msg_server_place_order.go index d3801d5ad3..5db309df39 100644 --- a/protocol/x/clob/keeper/msg_server_place_order.go +++ b/protocol/x/clob/keeper/msg_server_place_order.go @@ -114,35 +114,31 @@ func (k Keeper) HandleMsgPlaceOrder( // 4. Emit the new order placement indexer event. if order.IsConditionalOrder() { - if !isInternalOrder { // vault order indexer event logic is handled elsewhere - k.GetIndexerEventManager().AddTxnEvent( - ctx, - indexerevents.SubtypeStatefulOrder, - indexerevents.StatefulOrderEventVersion, - indexer_manager.GetBytes( - indexerevents.NewConditionalOrderPlacementEvent( - order, - ), + k.GetIndexerEventManager().AddTxnEvent( + ctx, + indexerevents.SubtypeStatefulOrder, + indexerevents.StatefulOrderEventVersion, + indexer_manager.GetBytes( + indexerevents.NewConditionalOrderPlacementEvent( + order, ), - ) - } + ), + ) processProposerMatchesEvents.PlacedConditionalOrderIds = append( processProposerMatchesEvents.PlacedConditionalOrderIds, order.OrderId, ) } else { - if !isInternalOrder { // vault order indexer event logic is handled elsewhere - k.GetIndexerEventManager().AddTxnEvent( - ctx, - indexerevents.SubtypeStatefulOrder, - indexerevents.StatefulOrderEventVersion, - indexer_manager.GetBytes( - indexerevents.NewLongTermOrderPlacementEvent( - order, - ), + k.GetIndexerEventManager().AddTxnEvent( + ctx, + indexerevents.SubtypeStatefulOrder, + indexerevents.StatefulOrderEventVersion, + indexer_manager.GetBytes( + indexerevents.NewLongTermOrderPlacementEvent( + order, ), - ) - } + ), + ) processProposerMatchesEvents.PlacedLongTermOrderIds = append( processProposerMatchesEvents.PlacedLongTermOrderIds, order.OrderId, diff --git a/protocol/x/clob/types/clob_keeper.go b/protocol/x/clob/types/clob_keeper.go index e60150cf50..3993d6036c 100644 --- a/protocol/x/clob/types/clob_keeper.go +++ b/protocol/x/clob/types/clob_keeper.go @@ -46,7 +46,6 @@ type ClobKeeper interface { HandleMsgCancelOrder( ctx sdk.Context, msg *MsgCancelOrder, - isInternalOrder bool, ) (err error) HandleMsgPlaceOrder( ctx sdk.Context, diff --git a/protocol/x/vault/keeper/keeper.go b/protocol/x/vault/keeper/keeper.go index deca94acf4..4ff8e98253 100644 --- a/protocol/x/vault/keeper/keeper.go +++ b/protocol/x/vault/keeper/keeper.go @@ -7,22 +7,20 @@ import ( storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/dydxprotocol/v4-chain/protocol/indexer/indexer_manager" "github.com/dydxprotocol/v4-chain/protocol/lib" "github.com/dydxprotocol/v4-chain/protocol/x/vault/types" ) type ( Keeper struct { - cdc codec.BinaryCodec - storeKey storetypes.StoreKey - clobKeeper types.ClobKeeper - perpetualsKeeper types.PerpetualsKeeper - pricesKeeper types.PricesKeeper - sendingKeeper types.SendingKeeper - subaccountsKeeper types.SubaccountsKeeper - indexerEventManager indexer_manager.IndexerEventManager - authorities map[string]struct{} + cdc codec.BinaryCodec + storeKey storetypes.StoreKey + clobKeeper types.ClobKeeper + perpetualsKeeper types.PerpetualsKeeper + pricesKeeper types.PricesKeeper + sendingKeeper types.SendingKeeper + subaccountsKeeper types.SubaccountsKeeper + authorities map[string]struct{} } ) @@ -34,26 +32,20 @@ func NewKeeper( pricesKeeper types.PricesKeeper, sendingKeeper types.SendingKeeper, subaccountsKeeper types.SubaccountsKeeper, - indexerEventManager indexer_manager.IndexerEventManager, authorities []string, ) *Keeper { return &Keeper{ - cdc: cdc, - storeKey: storeKey, - clobKeeper: clobKeeper, - perpetualsKeeper: perpetualsKeeper, - pricesKeeper: pricesKeeper, - sendingKeeper: sendingKeeper, - subaccountsKeeper: subaccountsKeeper, - indexerEventManager: indexerEventManager, - authorities: lib.UniqueSliceToSet(authorities), + cdc: cdc, + storeKey: storeKey, + clobKeeper: clobKeeper, + perpetualsKeeper: perpetualsKeeper, + pricesKeeper: pricesKeeper, + sendingKeeper: sendingKeeper, + subaccountsKeeper: subaccountsKeeper, + authorities: lib.UniqueSliceToSet(authorities), } } -func (k Keeper) GetIndexerEventManager() indexer_manager.IndexerEventManager { - return k.indexerEventManager -} - func (k Keeper) HasAuthority(authority string) bool { _, ok := k.authorities[authority] return ok diff --git a/protocol/x/vault/keeper/orders.go b/protocol/x/vault/keeper/orders.go index 51cadf2b94..5d8054dcc5 100644 --- a/protocol/x/vault/keeper/orders.go +++ b/protocol/x/vault/keeper/orders.go @@ -6,8 +6,6 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - indexerevents "github.com/dydxprotocol/v4-chain/protocol/indexer/events" - "github.com/dydxprotocol/v4-chain/protocol/indexer/indexer_manager" "github.com/dydxprotocol/v4-chain/protocol/lib" "github.com/dydxprotocol/v4-chain/protocol/lib/log" "github.com/dydxprotocol/v4-chain/protocol/lib/metrics" @@ -26,7 +24,6 @@ func (k Keeper) RefreshAllVaultOrders(ctx sdk.Context) { defer totalSharesIterator.Close() for ; totalSharesIterator.Valid(); totalSharesIterator.Next() { vaultId, err := types.GetVaultIdFromStateKey(totalSharesIterator.Key()) - if err != nil { log.ErrorLogWithError(ctx, "Failed to get vault ID from state key", err) continue @@ -87,7 +84,7 @@ func (k Keeper) RefreshVaultClobOrders(ctx sdk.Context, vaultId types.VaultId) ( err := k.clobKeeper.HandleMsgCancelOrder(ctx, clobtypes.NewMsgCancelOrderStateful( order.OrderId, uint32(ctx.BlockTime().Unix())+orderExpirationSeconds, - ), true) + )) if err != nil { log.ErrorLogWithError(ctx, "Failed to cancel order", err, "order", order, "vaultId", vaultId) } @@ -97,52 +94,24 @@ func (k Keeper) RefreshVaultClobOrders(ctx sdk.Context, vaultId types.VaultId) ( ) } } + // Place new CLOB orders. ordersToPlace, err := k.GetVaultClobOrders(ctx, vaultId) if err != nil { log.ErrorLogWithError(ctx, "Failed to get vault clob orders to place", err, "vaultId", vaultId) return err } - - for i, order := range ordersToPlace { + for _, order := range ordersToPlace { err := k.PlaceVaultClobOrder(ctx, order) if err != nil { log.ErrorLogWithError(ctx, "Failed to place order", err, "order", order, "vaultId", vaultId) } - vaultId.IncrCounterWithLabels( metrics.VaultPlaceOrder, metrics.GetLabelForBoolValue(metrics.Success, err == nil), ) - - // Send indexer messages. We expect ordersToCancel and ordersToPlace to have the same length - // and the order to place at each index to be a replacement of the order to cancel at the same index. - replacedOrder := ordersToCancel[i] - if replacedOrder == nil { - k.GetIndexerEventManager().AddTxnEvent( - ctx, - indexerevents.SubtypeStatefulOrder, - indexerevents.StatefulOrderEventVersion, - indexer_manager.GetBytes( - indexerevents.NewLongTermOrderPlacementEvent( - *order, - ), - ), - ) - } else { - k.GetIndexerEventManager().AddTxnEvent( - ctx, - indexerevents.SubtypeStatefulOrder, - indexerevents.StatefulOrderEventVersion, - indexer_manager.GetBytes( - indexerevents.NewLongTermOrderReplacementEvent( - replacedOrder.OrderId, - *order, - ), - ), - ) - } } + return nil } diff --git a/protocol/x/vault/keeper/orders_test.go b/protocol/x/vault/keeper/orders_test.go index 6f0fad2db4..371288ef70 100644 --- a/protocol/x/vault/keeper/orders_test.go +++ b/protocol/x/vault/keeper/orders_test.go @@ -7,10 +7,6 @@ import ( "github.com/cometbft/cometbft/types" "github.com/dydxprotocol/v4-chain/protocol/dtypes" - "github.com/dydxprotocol/v4-chain/protocol/indexer" - indexerevents "github.com/dydxprotocol/v4-chain/protocol/indexer/events" - "github.com/dydxprotocol/v4-chain/protocol/indexer/indexer_manager" - "github.com/dydxprotocol/v4-chain/protocol/indexer/msgsender" testapp "github.com/dydxprotocol/v4-chain/protocol/testutil/app" "github.com/dydxprotocol/v4-chain/protocol/testutil/constants" assettypes "github.com/dydxprotocol/v4-chain/protocol/x/assets/types" @@ -109,16 +105,11 @@ func TestRefreshAllVaultOrders(t *testing.T) { activationThresholdQuoteQuantums: big.NewInt(123_456_789), }, } + for name, tc := range tests { t.Run(name, func(t *testing.T) { - // Enable testapp's indexer event manager - msgSender := msgsender.NewIndexerMessageSenderInMemoryCollector() - appOpts := map[string]interface{}{ - indexer.MsgSenderInstanceForTest: msgSender, - } - // Initialize tApp and ctx (in deliverTx mode). - tApp := testapp.NewTestAppBuilder(t).WithAppOptions(appOpts).WithGenesisDocFn(func() (genesis types.GenesisDoc) { + tApp := testapp.NewTestAppBuilder(t).WithGenesisDocFn(func() (genesis types.GenesisDoc) { genesis = testapp.DefaultGenesis() // Initialize each vault with quote quantums to be able to place orders. testapp.UpdateGenesisDocWithAppStateForModule( @@ -169,7 +160,6 @@ func TestRefreshAllVaultOrders(t *testing.T) { // Simulate vault orders placed in last block. numPreviousOrders := 0 - previousOrders := make(map[vaulttypes.VaultId][]*clobtypes.Order) for i, vaultId := range tc.vaultIds { if tc.totalShares[i].Sign() > 0 && tc.assetQuantums[i].Cmp(tc.activationThresholdQuoteQuantums) >= 0 { orders, err := tApp.App.VaultKeeper.GetVaultClobOrders( @@ -181,7 +171,6 @@ func TestRefreshAllVaultOrders(t *testing.T) { err := tApp.App.VaultKeeper.PlaceVaultClobOrder(ctx, order) require.NoError(t, err) } - previousOrders[vaultId] = orders numPreviousOrders += len(orders) } } @@ -194,34 +183,13 @@ func TestRefreshAllVaultOrders(t *testing.T) { // cancelled and orders from this block have been placed. numExpectedOrders := 0 allExpectedOrderIds := make(map[clobtypes.OrderId]bool) - expectedIndexerEvents := make([]indexer_manager.IndexerTendermintEvent, 0) - indexerEventIndex := 0 - for vault_index, vaultId := range tc.vaultIds { - if tc.totalShares[vault_index].Sign() > 0 && - tc.assetQuantums[vault_index].Cmp(tc.activationThresholdQuoteQuantums) >= 0 { + for i, vaultId := range tc.vaultIds { + if tc.totalShares[i].Sign() > 0 && tc.assetQuantums[i].Cmp(tc.activationThresholdQuoteQuantums) >= 0 { expectedOrders, err := tApp.App.VaultKeeper.GetVaultClobOrders(ctx, vaultId) require.NoError(t, err) numExpectedOrders += len(expectedOrders) - ordersToCancel := previousOrders[vaultId] - for i, order := range expectedOrders { + for _, order := range expectedOrders { allExpectedOrderIds[order.OrderId] = true - orderToCancel := ordersToCancel[i] - event := indexer_manager.IndexerTendermintEvent{ - Subtype: indexerevents.SubtypeStatefulOrder, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_TransactionIndex{ - TransactionIndex: 0, - }, - EventIndex: uint32(indexerEventIndex), - Version: indexerevents.StatefulOrderEventVersion, - DataBytes: indexer_manager.GetBytes( - indexerevents.NewLongTermOrderReplacementEvent( - orderToCancel.OrderId, - *order, - ), - ), - } - indexerEventIndex += 1 - expectedIndexerEvents = append(expectedIndexerEvents, event) } } } @@ -230,13 +198,6 @@ func TestRefreshAllVaultOrders(t *testing.T) { for _, order := range allStatefulOrders { require.True(t, allExpectedOrderIds[order.OrderId]) } - - // test that the indexer events emitted are as expected - block := tApp.App.VaultKeeper.GetIndexerEventManager().ProduceBlock(ctx) - require.Len(t, block.Events, numExpectedOrders) - for i, event := range block.Events { - require.Equal(t, expectedIndexerEvents[i], *event) - } }) } } diff --git a/protocol/x/vault/types/expected_keepers.go b/protocol/x/vault/types/expected_keepers.go index 10549cf5ec..af355239d9 100644 --- a/protocol/x/vault/types/expected_keepers.go +++ b/protocol/x/vault/types/expected_keepers.go @@ -23,7 +23,6 @@ type ClobKeeper interface { HandleMsgCancelOrder( ctx sdk.Context, msg *clobtypes.MsgCancelOrder, - isInternalOrder bool, ) (err error) HandleMsgPlaceOrder( ctx sdk.Context,