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 81bf376329..7815ffb32b 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 @@ -1365,31 +1365,47 @@ export interface AddressTradingRewardSDKType { denom_amount: Uint8Array; } -/** OpenInterestUpdateEventV1 is used for open interest update events */ +/** + * OpenInterestUpdateEventV1 is used for open interest update events + * Deprecated. + */ + +/** @deprecated */ export interface OpenInterestUpdateEventV1 { - /** The list of all open interest updates in the block. */ openInterestUpdates: OpenInterestUpdate[]; } -/** OpenInterestUpdateEventV1 is used for open interest update events */ +/** + * OpenInterestUpdateEventV1 is used for open interest update events + * Deprecated. + */ + +/** @deprecated */ export interface OpenInterestUpdateEventV1SDKType { - /** The list of all open interest updates in the block. */ open_interest_updates: OpenInterestUpdateSDKType[]; } -/** OpenInterestUpdate contains a single open interest update for a perpetual */ +/** + * OpenInterestUpdate contains a single open interest update for a perpetual + * Deprecated. + */ + +/** @deprecated */ export interface OpenInterestUpdate { - /** The ID of the perpetual market. */ perpetualId: number; /** The new open interest value for the perpetual market. */ openInterest: Uint8Array; } -/** OpenInterestUpdate contains a single open interest update for a perpetual */ +/** + * OpenInterestUpdate contains a single open interest update for a perpetual + * Deprecated. + */ + +/** @deprecated */ export interface OpenInterestUpdateSDKType { - /** The ID of the perpetual market. */ perpetual_id: number; /** The new open interest value for the perpetual market. */ diff --git a/proto/dydxprotocol/indexer/events/events.proto b/proto/dydxprotocol/indexer/events/events.proto index 2b6b1eec7e..8f2a6ce88f 100644 --- a/proto/dydxprotocol/indexer/events/events.proto +++ b/proto/dydxprotocol/indexer/events/events.proto @@ -531,14 +531,18 @@ message AddressTradingReward { } // OpenInterestUpdateEventV1 is used for open interest update events +// Deprecated. message OpenInterestUpdateEventV1 { // The list of all open interest updates in the block. + option deprecated = true; repeated OpenInterestUpdate open_interest_updates = 1; } // OpenInterestUpdate contains a single open interest update for a perpetual +// Deprecated. message OpenInterestUpdate { // The ID of the perpetual market. + option deprecated = true; uint32 perpetual_id = 1; // The new open interest value for the perpetual market. diff --git a/protocol/indexer/events/events.pb.go b/protocol/indexer/events/events.pb.go index 61d702ee01..70cc9eface 100644 --- a/protocol/indexer/events/events.pb.go +++ b/protocol/indexer/events/events.pb.go @@ -2334,8 +2334,10 @@ func (m *AddressTradingReward) GetOwner() string { } // OpenInterestUpdateEventV1 is used for open interest update events +// Deprecated. +// +// Deprecated: Do not use. type OpenInterestUpdateEventV1 struct { - // The list of all open interest updates in the block. OpenInterestUpdates []*OpenInterestUpdate `protobuf:"bytes,1,rep,name=open_interest_updates,json=openInterestUpdates,proto3" json:"open_interest_updates,omitempty"` } @@ -2380,8 +2382,10 @@ func (m *OpenInterestUpdateEventV1) GetOpenInterestUpdates() []*OpenInterestUpda } // OpenInterestUpdate contains a single open interest update for a perpetual +// Deprecated. +// +// Deprecated: Do not use. type OpenInterestUpdate struct { - // The ID of the perpetual market. PerpetualId uint32 `protobuf:"varint,1,opt,name=perpetual_id,json=perpetualId,proto3" json:"perpetual_id,omitempty"` // The new open interest value for the perpetual market. OpenInterest github_com_dydxprotocol_v4_chain_protocol_dtypes.SerializableInt `protobuf:"bytes,2,opt,name=open_interest,json=openInterest,proto3,customtype=github.com/dydxprotocol/v4-chain/protocol/dtypes.SerializableInt" json:"open_interest"` @@ -2576,12 +2580,12 @@ func init() { } var fileDescriptor_6331dfb59c6fd2bb = []byte{ - // 2322 bytes of a gzipped FileDescriptorProto + // 2325 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, + 0x99, 0xc9, 0x20, 0x6e, 0x48, 0x70, 0x40, 0x02, 0x09, 0x71, 0xe0, 0x80, 0xc4, 0x85, 0xcb, 0x4a, 0x1c, 0x90, 0x10, 0x37, 0x0e, 0x88, 0xcb, 0xde, 0x18, 0x71, 0x01, 0x81, 0xb4, 0x42, 0x33, 0x07, 0xfe, 0x0d, 0x54, 0x1f, 0xdd, 0xfe, 0xf6, 0x78, 0x26, 0x59, 0x09, 0x21, 0x4e, 0x76, 0xbd, 0x57, 0xef, 0xf7, 0x5e, 0xbd, 0xf7, 0xaa, 0xea, 0xd5, 0x6b, 0xb8, 0x6b, 0x5f, 0xda, 0x4f, 0x82, 0xd0, @@ -2592,14 +2596,14 @@ var fileDescriptor_6331dfb59c6fd2bb = []byte{ 0xec, 0x98, 0x21, 0xc1, 0xcc, 0xf7, 0x94, 0xc4, 0x9b, 0x03, 0x25, 0x12, 0xc2, 0xc5, 0xea, 0x8a, 0xe5, 0xf8, 0x27, 0x23, 0xe1, 0x3b, 0x27, 0x07, 0x24, 0x0c, 0x48, 0xd4, 0xc2, 0x8e, 0x92, 0x58, 0x7d, 0xa9, 0x04, 0x6b, 0x9d, 0x60, 0xcb, 0xf2, 0x5b, 0x5e, 0x24, 0x45, 0xf4, 0xbf, 0x68, 0x70, - 0x63, 0xbb, 0xe5, 0xd9, 0xd4, 0x6b, 0x1e, 0x07, 0x36, 0x8e, 0xc8, 0x83, 0x55, 0xf4, 0x15, 0x98, + 0x63, 0xbb, 0xe5, 0xd9, 0xd4, 0x6b, 0x1e, 0x07, 0x36, 0x8e, 0xc8, 0x83, 0x55, 0xf4, 0x35, 0x98, 0x49, 0x90, 0x4d, 0x6a, 0x57, 0xb4, 0x3b, 0xda, 0xdd, 0x82, 0x91, 0x4f, 0x68, 0x75, 0x1b, 0xbd, 0x01, 0xa5, 0x53, 0x29, 0x65, 0x5e, 0x60, 0xa7, 0x45, 0xcc, 0x20, 0x70, 0x2b, 0xa9, 0x3b, 0xda, 0xdd, 0x49, 0xe3, 0x86, 0x62, 0x3c, 0xe0, 0xf4, 0x46, 0xe0, 0x22, 0x17, 0x0a, 0xf1, 0x5c, 0x61, - 0x52, 0x25, 0x7d, 0x47, 0xbb, 0x3b, 0x53, 0xdb, 0xf9, 0xec, 0xf3, 0xdb, 0x13, 0xff, 0xf8, 0xfc, - 0xf6, 0x37, 0x9b, 0x34, 0x3a, 0x6b, 0x9d, 0x54, 0x2d, 0xdf, 0x5d, 0xe9, 0xb2, 0xff, 0xe2, 0x9d, + 0x52, 0x25, 0x7d, 0x47, 0xbb, 0x3b, 0x53, 0xdb, 0xf9, 0xfc, 0x8b, 0xdb, 0x13, 0xff, 0xf8, 0xe2, + 0xf6, 0xb7, 0x9b, 0x34, 0x3a, 0x6b, 0x9d, 0x54, 0x2d, 0xdf, 0x5d, 0xe9, 0xb2, 0xff, 0xe2, 0x9d, 0xb7, 0xad, 0x33, 0x4c, 0xbd, 0xf6, 0x02, 0xec, 0xe8, 0x32, 0x20, 0xac, 0x7a, 0x48, 0x42, 0x8a, - 0x1d, 0xfa, 0x14, 0x9f, 0x38, 0xa4, 0xee, 0x45, 0xc6, 0x8c, 0x82, 0xaf, 0x73, 0x74, 0xfd, 0xa7, + 0x1d, 0xfa, 0x14, 0x9f, 0x38, 0xa4, 0xee, 0x45, 0xc6, 0x8c, 0x82, 0xaf, 0x73, 0x74, 0xfd, 0xe7, 0x29, 0x98, 0x55, 0x2b, 0xda, 0xe2, 0x81, 0x7d, 0xb0, 0x8a, 0xf6, 0x60, 0xaa, 0x25, 0x16, 0xc7, 0x2a, 0xda, 0x9d, 0xf4, 0xdd, 0xfc, 0xda, 0x5b, 0xd5, 0x11, 0x89, 0x50, 0xed, 0xf1, 0x47, 0x2d, 0xc3, 0x2d, 0x35, 0x62, 0x08, 0xb4, 0x09, 0x19, 0x6e, 0x87, 0x58, 0xee, 0xec, 0xda, 0xbd, 0x71, @@ -2623,106 +2627,106 @@ var fileDescriptor_6331dfb59c6fd2bb = []byte{ 0xc0, 0x5d, 0xa8, 0x06, 0x99, 0x13, 0xcc, 0x88, 0xc0, 0xce, 0xaf, 0x55, 0xc7, 0xf0, 0x4a, 0x87, 0x65, 0x86, 0x90, 0x45, 0x8b, 0x90, 0x4b, 0x56, 0xc6, 0xf5, 0x97, 0x8c, 0x64, 0xac, 0x7f, 0x12, 0xab, 0xed, 0x72, 0xe6, 0x75, 0xa8, 0xd5, 0x7f, 0xab, 0x41, 0xe1, 0xd0, 0x6f, 0x85, 0x16, 0xb9, - 0x7f, 0xca, 0xb7, 0x14, 0x43, 0xdf, 0x86, 0x42, 0xfb, 0x2c, 0x8b, 0x33, 0x78, 0x68, 0x86, 0x26, + 0x7f, 0xca, 0xb7, 0x14, 0x43, 0xdf, 0x85, 0x42, 0xfb, 0x2c, 0x8b, 0x33, 0x78, 0x68, 0x86, 0x26, 0x84, 0x8b, 0xd5, 0x6a, 0x5d, 0xd2, 0x0e, 0x13, 0xe9, 0xba, 0xcd, 0x03, 0xce, 0x3a, 0xc6, 0xe8, 0x1d, 0x98, 0xc2, 0xb6, 0x1d, 0x12, 0xc6, 0xc4, 0x2a, 0xa7, 0x6b, 0x95, 0xbf, 0xfe, 0xfe, 0xed, 0xb2, 0xba, 0x12, 0xd6, 0x25, 0xe7, 0x30, 0x0a, 0xa9, 0xd7, 0xdc, 0x99, 0x30, 0xe2, 0xa9, 0xb5, - 0x1c, 0x64, 0x99, 0x30, 0x52, 0xff, 0x4d, 0x1a, 0x6e, 0x1c, 0x85, 0xd8, 0x63, 0xa7, 0x24, 0x8c, - 0xfd, 0xd0, 0x84, 0x32, 0x23, 0x9e, 0x4d, 0x42, 0xf3, 0xfa, 0x0c, 0x37, 0x90, 0x84, 0xec, 0xa4, - 0x21, 0x17, 0x6e, 0x85, 0xc4, 0xa2, 0x01, 0x25, 0x5e, 0xd4, 0xa3, 0x2b, 0x75, 0x15, 0x5d, 0x73, - 0x09, 0x6a, 0x97, 0xba, 0x05, 0xc8, 0x61, 0xc6, 0xe4, 0x31, 0x92, 0x16, 0x29, 0x39, 0x25, 0xc6, - 0x75, 0x1b, 0xcd, 0x43, 0x16, 0xbb, 0x7c, 0x9a, 0xd8, 0x89, 0x19, 0x43, 0x8d, 0x50, 0x0d, 0xb2, - 0xd2, 0xee, 0xca, 0xa4, 0x30, 0xe8, 0x8d, 0x91, 0x49, 0xd1, 0x15, 0x78, 0x43, 0x49, 0xa2, 0x1d, - 0x98, 0x4e, 0xec, 0xa9, 0x64, 0x5f, 0x19, 0xa6, 0x2d, 0xac, 0xff, 0x2d, 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, 0x4a, 0xc3, 0xcd, 0x4d, 0xe2, 0x90, - 0x0b, 0x12, 0xe2, 0x66, 0x47, 0x3d, 0xf0, 0x2d, 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, 0xa6, 0x00, 0xf5, 0xe7, 0xdf, 0x17, 0x1b, 0x8d, 0x3b, 0x30, 0xc3, - 0x4b, 0x6a, 0x93, 0xdf, 0xa4, 0xf1, 0x09, 0x58, 0x30, 0x80, 0xd3, 0x1a, 0x98, 0x86, 0x75, 0x7b, - 0x1c, 0x97, 0x7e, 0x19, 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, 0xf5, 0xb1, 0xf5, 0xae, 0x73, 0xf9, 0x44, 0xe7, 0x9c, 0x82, 0xed, 0xa2, 0xb2, - 0xdd, 0x4c, 0x2e, 0x55, 0x4c, 0xeb, 0xff, 0x9c, 0x81, 0xf2, 0x61, 0x84, 0x23, 0x72, 0xda, 0x72, - 0x44, 0xc6, 0xc5, 0x6e, 0x7e, 0x04, 0x79, 0x71, 0x4a, 0x98, 0x81, 0x83, 0xad, 0xb8, 0x3c, 0xd9, - 0x1d, 0x7d, 0x85, 0x0c, 0xc0, 0xe9, 0x26, 0x36, 0x38, 0x96, 0x2b, 0x18, 0xb5, 0x54, 0x45, 0xdb, - 0xe1, 0xbb, 0x37, 0xa1, 0x23, 0x1f, 0x0a, 0x52, 0xa5, 0x7a, 0x1c, 0xaa, 0x13, 0x7b, 0xe7, 0x8a, - 0x4a, 0x0d, 0x89, 0x26, 0x0b, 0x57, 0xbf, 0x83, 0x82, 0x7e, 0xac, 0xc1, 0x92, 0xe5, 0x7b, 0xb6, - 0xf0, 0x08, 0x76, 0xcc, 0x8e, 0x05, 0x8b, 0xad, 0x2a, 0xaf, 0xdf, 0xfd, 0x57, 0xd7, 0xbf, 0xd1, - 0x06, 0xed, 0x5d, 0xf7, 0xce, 0x84, 0xb1, 0x60, 0x0d, 0x63, 0x0f, 0xb1, 0x28, 0x0a, 0x69, 0xb3, - 0x49, 0x42, 0x62, 0xab, 0x9b, 0xfc, 0x1a, 0x2c, 0x3a, 0x8a, 0x21, 0x07, 0x5b, 0x94, 0xb0, 0xd1, - 0x0f, 0x34, 0x58, 0x70, 0x7c, 0xaf, 0x69, 0x46, 0x24, 0x74, 0xfb, 0x3c, 0x34, 0xf5, 0xba, 0x69, - 0xb1, 0xe7, 0x7b, 0xcd, 0x23, 0x12, 0xba, 0x03, 0xdc, 0x33, 0xef, 0x0c, 0xe4, 0xa1, 0xef, 0x42, - 0x29, 0x4e, 0x8f, 0xb6, 0x01, 0x39, 0x61, 0xc0, 0xde, 0x15, 0x0d, 0x30, 0xda, 0x88, 0xf2, 0xc6, - 0xf7, 0x7b, 0xa8, 0x8b, 0xdf, 0x81, 0xca, 0xb0, 0x4c, 0x46, 0x9b, 0x71, 0xd5, 0xf2, 0x5a, 0x65, - 0x90, 0xaa, 0x59, 0x16, 0xff, 0xa8, 0xc1, 0xfc, 0xe0, 0xbc, 0x45, 0x0f, 0xa1, 0x28, 0xb6, 0x04, - 0xb1, 0x55, 0x00, 0x92, 0x53, 0xef, 0xde, 0xab, 0xe9, 0xaa, 0xdb, 0xc6, 0xac, 0x42, 0x52, 0x63, - 0xf4, 0x01, 0x64, 0x65, 0x0f, 0x46, 0x3d, 0xd8, 0x87, 0xd4, 0x47, 0xb2, 0x6d, 0x53, 0xed, 0x34, - 0xcc, 0x10, 0x62, 0x86, 0x12, 0x5f, 0xb4, 0x60, 0x69, 0x44, 0xda, 0x5f, 0x93, 0x93, 0xbe, 0xd7, - 0xaf, 0xa4, 0x23, 0x93, 0xd1, 0xa7, 0x80, 0x92, 0xbd, 0x72, 0x75, 0x57, 0x15, 0x13, 0x2c, 0x45, - 0xe1, 0x59, 0x30, 0x2c, 0x71, 0xaf, 0x69, 0x81, 0x7f, 0xd0, 0x60, 0x71, 0x78, 0x6a, 0x22, 0x03, - 0x66, 0x7c, 0xe7, 0x1a, 0x96, 0x06, 0xbe, 0x93, 0x64, 0xc0, 0xe6, 0x95, 0x8a, 0x6e, 0x65, 0x78, - 0xd2, 0x04, 0x90, 0xf7, 0xca, 0x6e, 0x26, 0x97, 0x2e, 0x66, 0xf4, 0x5f, 0x69, 0x80, 0xc4, 0xb5, - 0xd3, 0xfd, 0xd4, 0x9e, 0x85, 0x54, 0xd2, 0x54, 0x49, 0x51, 0xf1, 0x10, 0x62, 0x97, 0xee, 0x89, - 0xef, 0xc8, 0xe7, 0xa4, 0xa1, 0x46, 0xbc, 0xb0, 0x38, 0xc3, 0xcc, 0x94, 0xcd, 0x06, 0x51, 0x79, - 0xe4, 0x8c, 0xe9, 0x33, 0xcc, 0xe4, 0x3b, 0xb8, 0xbb, 0x45, 0x93, 0xe9, 0x69, 0xd1, 0xbc, 0x09, - 0x25, 0x1c, 0xf9, 0x2e, 0xb5, 0xcc, 0x90, 0x30, 0xdf, 0x69, 0xf1, 0x8c, 0x11, 0x07, 0x7a, 0xc9, - 0x28, 0x4a, 0x86, 0x91, 0xd0, 0xf5, 0x3f, 0xa5, 0xe1, 0x4b, 0xc9, 0x95, 0x3c, 0xa8, 0x39, 0xd0, - 0x6b, 0xf1, 0xcb, 0xeb, 0xa6, 0x79, 0xc8, 0xf2, 0x5a, 0x86, 0x84, 0xc2, 0xee, 0x69, 0x43, 0x8d, - 0x46, 0x1b, 0xbd, 0x03, 0x59, 0x16, 0xe1, 0xa8, 0x25, 0xab, 0xcd, 0xd9, 0x71, 0x02, 0xbb, 0xa1, - 0x54, 0x1e, 0x0a, 0x39, 0x43, 0xc9, 0xa3, 0x6f, 0xc0, 0x92, 0xaa, 0x5c, 0x4d, 0xcb, 0xf7, 0x2e, - 0x48, 0xc8, 0xf8, 0x43, 0x28, 0x69, 0x4e, 0x64, 0x85, 0x23, 0x16, 0xd4, 0x94, 0x8d, 0x64, 0x46, - 0xdc, 0x7e, 0x19, 0xec, 0xbe, 0xa9, 0xc1, 0xee, 0x43, 0x6f, 0x40, 0x29, 0x2e, 0xdd, 0x78, 0xdd, - 0x64, 0xf2, 0x7f, 0xe2, 0x64, 0x2e, 0x18, 0x37, 0x62, 0x46, 0x83, 0x84, 0x47, 0xd4, 0x3a, 0xe7, - 0x2f, 0x16, 0x16, 0x91, 0xc0, 0x3c, 0xc1, 0xac, 0xa3, 0xb8, 0x9e, 0x96, 0x2f, 0x16, 0xce, 0xa9, - 0x61, 0xd6, 0x2e, 0xad, 0xbf, 0x0a, 0xb3, 0xb2, 0x5a, 0xa5, 0xd1, 0xa5, 0x19, 0x51, 0x12, 0x56, - 0x40, 0xc0, 0x16, 0x12, 0xea, 0x11, 0x25, 0xe1, 0xfb, 0xa9, 0x8a, 0xa6, 0xff, 0x2c, 0x33, 0x32, - 0x86, 0x6b, 0xff, 0x8f, 0xe1, 0x7f, 0x75, 0x0c, 0xd1, 0x03, 0xc8, 0x2b, 0xa7, 0x8a, 0xf6, 0x71, - 0x5e, 0x38, 0x6f, 0x8c, 0xaa, 0xbe, 0x27, 0xe6, 0xa2, 0x87, 0x0c, 0x6e, 0xf2, 0x5f, 0xff, 0x65, - 0x0a, 0x16, 0xf7, 0x3a, 0x35, 0x1d, 0x07, 0x8c, 0x84, 0xd1, 0xb0, 0x9d, 0x8d, 0x20, 0xe3, 0x61, - 0x97, 0xa8, 0x93, 0x48, 0xfc, 0xe7, 0xeb, 0xa5, 0x1e, 0x8d, 0x28, 0x76, 0xf8, 0x59, 0xd4, 0xa4, - 0x9e, 0x68, 0x30, 0xca, 0x97, 0x50, 0x51, 0x71, 0xf6, 0x05, 0xa3, 0x11, 0xb8, 0xe8, 0x3d, 0xa8, - 0xb8, 0x98, 0x7a, 0x11, 0xf1, 0xb0, 0x67, 0x11, 0xf3, 0x34, 0xc4, 0x96, 0xe8, 0x42, 0x70, 0x19, - 0x99, 0x2c, 0xf3, 0x1d, 0xfc, 0x6d, 0xc5, 0x96, 0x92, 0xf3, 0xc2, 0xa5, 0x71, 0xe5, 0x6f, 0x7a, - 0xbe, 0xbc, 0xe8, 0xe4, 0xe3, 0x93, 0x97, 0xcc, 0x46, 0x99, 0xcf, 0x88, 0xab, 0xf8, 0x03, 0xc5, - 0xdf, 0xcd, 0xe4, 0xb2, 0xc5, 0xa9, 0xdd, 0x4c, 0x6e, 0xaa, 0x98, 0x33, 0x6e, 0xf9, 0x01, 0xf1, - 0x4c, 0xae, 0x20, 0x24, 0x2c, 0x32, 0x1d, 0xff, 0x31, 0x09, 0x4d, 0x0b, 0x07, 0xbd, 0x8c, 0x56, - 0x10, 0x48, 0x86, 0xfe, 0x8b, 0x14, 0xcc, 0xc9, 0x47, 0x56, 0x9c, 0x89, 0xb1, 0x77, 0x7a, 0xf7, - 0x88, 0xd6, 0xb7, 0x47, 0xda, 0xe9, 0x9e, 0xfa, 0x62, 0xd3, 0x3d, 0xfd, 0xb2, 0x74, 0x1f, 0x98, - 0xc1, 0x99, 0x57, 0xc9, 0xe0, 0xc9, 0xc1, 0x19, 0xac, 0xff, 0x4e, 0x83, 0x79, 0xe9, 0x9f, 0x24, - 0xd9, 0x46, 0x5c, 0x65, 0xea, 0xc8, 0x48, 0x0d, 0x3f, 0x32, 0xd2, 0xe3, 0xdc, 0x55, 0x99, 0x21, - 0x1b, 0xb5, 0x7f, 0x3b, 0x4d, 0x0e, 0xd8, 0x4e, 0x3a, 0x83, 0xb9, 0xa3, 0x10, 0xdb, 0xd4, 0x6b, - 0x1a, 0xe4, 0x31, 0x0e, 0x6d, 0xd6, 0x7e, 0x3f, 0xdf, 0x88, 0x24, 0xc3, 0x0c, 0x25, 0x47, 0x7d, - 0xf5, 0x59, 0x1d, 0x59, 0x44, 0xab, 0xb6, 0x6e, 0x17, 0xa6, 0x31, 0x1b, 0x75, 0xa9, 0xd0, 0x7f, - 0xae, 0x41, 0x79, 0xd0, 0x44, 0x54, 0x86, 0x49, 0xff, 0xb1, 0x47, 0xe2, 0xce, 0xbd, 0x1c, 0xa0, - 0x73, 0x98, 0xb1, 0x89, 0xe7, 0xbb, 0x71, 0x33, 0x26, 0x75, 0xcd, 0x5f, 0xbe, 0xf2, 0x02, 0x5d, - 0xf6, 0x75, 0xf4, 0xef, 0x6b, 0xb0, 0x70, 0x3f, 0x20, 0x5e, 0x5d, 0xe5, 0x7f, 0x77, 0x57, 0xc1, - 0x82, 0xb9, 0xde, 0xdd, 0xd1, 0xf9, 0x45, 0x6c, 0x74, 0xd7, 0xb0, 0x1f, 0xd6, 0xb8, 0xe9, 0xf7, - 0xd1, 0x98, 0xfe, 0x6b, 0x0d, 0x50, 0xff, 0xdc, 0x71, 0x3e, 0x28, 0xba, 0x50, 0xe8, 0x32, 0xef, - 0xda, 0x5d, 0x35, 0xd3, 0x69, 0xaf, 0xfe, 0x6c, 0xd4, 0x99, 0xb9, 0xf6, 0xbf, 0x71, 0x66, 0xa2, - 0x77, 0x61, 0xd8, 0x49, 0xa9, 0xfa, 0x51, 0xe5, 0x4e, 0x9f, 0xec, 0x71, 0xe6, 0x06, 0x0e, 0xfa, - 0xc5, 0x92, 0x73, 0x54, 0x75, 0x69, 0xcb, 0xdd, 0xa1, 0x0f, 0x84, 0x58, 0xcd, 0xf8, 0xec, 0xf9, - 0xb2, 0xf6, 0xec, 0xf9, 0xb2, 0xf6, 0xaf, 0xe7, 0xcb, 0xda, 0x4f, 0x5e, 0x2c, 0x4f, 0x3c, 0x7b, - 0xb1, 0x3c, 0xf1, 0xf7, 0x17, 0xcb, 0x13, 0x0f, 0xdf, 0x1b, 0x3f, 0x78, 0xdd, 0x1f, 0xef, 0x4f, - 0xb2, 0x82, 0xf1, 0xb5, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x6f, 0xa5, 0x55, 0x11, 0xe2, 0x1f, - 0x00, 0x00, + 0x1c, 0x64, 0x99, 0x30, 0x52, 0xff, 0x2c, 0x0d, 0x37, 0x8e, 0x42, 0xec, 0xb1, 0x53, 0x12, 0xc6, + 0x7e, 0x68, 0x42, 0x99, 0x11, 0xcf, 0x26, 0xa1, 0x79, 0x7d, 0x86, 0x1b, 0x48, 0x42, 0x76, 0xd2, + 0x90, 0x0b, 0xb7, 0x42, 0x62, 0xd1, 0x80, 0x12, 0x2f, 0xea, 0xd1, 0x95, 0xba, 0x8a, 0xae, 0xb9, + 0x04, 0xb5, 0x4b, 0xdd, 0x02, 0xe4, 0x30, 0x63, 0xf2, 0x18, 0x49, 0x8b, 0x94, 0x9c, 0x12, 0xe3, + 0xba, 0x8d, 0xe6, 0x21, 0x8b, 0x5d, 0x3e, 0x4d, 0xec, 0xc4, 0x8c, 0xa1, 0x46, 0xa8, 0x06, 0x59, + 0x69, 0x77, 0x65, 0x52, 0x18, 0xf4, 0xc6, 0xc8, 0xa4, 0xe8, 0x0a, 0xbc, 0xa1, 0x24, 0xd1, 0x0e, + 0x4c, 0x27, 0xf6, 0x54, 0xb2, 0xaf, 0x0c, 0xd3, 0x16, 0xd6, 0xff, 0x96, 0x86, 0xe2, 0xfd, 0xd0, + 0x26, 0xe1, 0x36, 0x75, 0x9c, 0x38, 0x5a, 0xc7, 0x90, 0x77, 0xf1, 0x39, 0x09, 0x4d, 0x9f, 0x73, + 0x46, 0x27, 0xef, 0x00, 0xc7, 0x09, 0x3c, 0x75, 0x71, 0x80, 0x00, 0x12, 0x14, 0xb4, 0x0d, 0x93, + 0x12, 0x30, 0xf5, 0x3a, 0x80, 0x3b, 0x13, 0x86, 0x14, 0x47, 0x9f, 0x42, 0xc9, 0xa1, 0x8f, 0x5a, + 0xd4, 0xc6, 0x11, 0xf5, 0x3d, 0x65, 0xa4, 0x3c, 0xee, 0x56, 0x46, 0x7a, 0x61, 0xaf, 0x2d, 0x25, + 0x20, 0xc5, 0x69, 0x57, 0x74, 0x7a, 0xa8, 0xe8, 0x36, 0xe4, 0x4f, 0xa9, 0xe3, 0x98, 0x2a, 0x7c, + 0x69, 0x11, 0x3e, 0xe0, 0xa4, 0x75, 0x19, 0x42, 0x71, 0x7b, 0x70, 0xff, 0x9c, 0x12, 0x22, 0xa2, + 0x88, 0xf8, 0xed, 0x71, 0x4e, 0xc2, 0x6d, 0x42, 0x38, 0x33, 0x4a, 0x98, 0x59, 0xc9, 0x8c, 0x62, + 0xe6, 0x5b, 0x80, 0x22, 0x3f, 0xc2, 0x8e, 0xc9, 0xd1, 0x88, 0x6d, 0x0a, 0xa9, 0xca, 0x94, 0xd0, + 0x50, 0x14, 0x9c, 0x6d, 0xc1, 0xd8, 0xe7, 0xf4, 0xbe, 0xd9, 0x02, 0xa6, 0x92, 0xeb, 0x9b, 0x7d, + 0xc4, 0xe9, 0xb5, 0x02, 0xe4, 0xa3, 0x76, 0xd4, 0xf4, 0x9f, 0xa4, 0xe1, 0xe6, 0x26, 0x71, 0xc8, + 0x05, 0x09, 0x71, 0xb3, 0xa3, 0x1e, 0xf8, 0x0e, 0x40, 0xbc, 0x62, 0x72, 0xb5, 0x0d, 0x18, 0x87, + 0xb8, 0x0d, 0xc7, 0xc1, 0xfd, 0xd3, 0x53, 0x46, 0xa2, 0x88, 0x7a, 0xcd, 0x2b, 0xed, 0xb8, 0x18, + 0xbc, 0x0d, 0xd7, 0x57, 0x9a, 0xa5, 0xfb, 0x4b, 0xb3, 0x9e, 0xd0, 0x65, 0xfa, 0x42, 0x77, 0x0f, + 0xca, 0xd2, 0xa5, 0x8f, 0x5a, 0x7e, 0x44, 0xcc, 0x47, 0x2d, 0xec, 0x45, 0x2d, 0x97, 0x89, 0x28, + 0x66, 0x0c, 0xe9, 0xee, 0x0f, 0x39, 0xeb, 0x43, 0xc5, 0x41, 0x73, 0x90, 0xa5, 0xcc, 0x3c, 0x69, + 0x5d, 0x8a, 0x60, 0xe6, 0x8c, 0x49, 0xca, 0x6a, 0xad, 0x4b, 0x7e, 0xe3, 0x51, 0x66, 0x9e, 0x52, + 0x0f, 0x3b, 0x26, 0x37, 0xd0, 0x21, 0x2e, 0xdf, 0x8c, 0x53, 0x62, 0x4e, 0x89, 0xb2, 0x6d, 0xce, + 0x39, 0x4c, 0x18, 0xfa, 0x8f, 0x53, 0x80, 0xfa, 0xf3, 0xef, 0xcb, 0x8d, 0xc6, 0x1d, 0x98, 0xe1, + 0x25, 0xb5, 0xc9, 0x6f, 0xd2, 0xf8, 0x04, 0x2c, 0x18, 0xc0, 0x69, 0x0d, 0x4c, 0xc3, 0xba, 0x3d, + 0x8e, 0x4b, 0xbf, 0x0a, 0x20, 0x3d, 0xc6, 0xe8, 0x53, 0xa2, 0x3c, 0x3a, 0x2d, 0x28, 0x87, 0xf4, + 0x29, 0xe9, 0x70, 0xcf, 0x64, 0xa7, 0x7b, 0x16, 0x21, 0xc7, 0x5a, 0x27, 0x11, 0xb5, 0xce, 0x99, + 0xf0, 0x5b, 0xc6, 0x48, 0xc6, 0xfa, 0xbf, 0x53, 0x70, 0xab, 0x6d, 0x79, 0x77, 0x21, 0xf1, 0xf0, + 0x3a, 0xaf, 0xb6, 0x9e, 0x8b, 0xed, 0x29, 0x2c, 0xc9, 0x8a, 0xce, 0x36, 0xdb, 0x8b, 0x0e, 0x7c, + 0x46, 0x79, 0x40, 0x58, 0x25, 0x2d, 0xaa, 0xe3, 0xf7, 0xc7, 0xd6, 0xd4, 0x88, 0x31, 0x1a, 0x0a, + 0xc2, 0x58, 0x50, 0xf0, 0x7d, 0x1c, 0x86, 0x3c, 0xb8, 0x15, 0xeb, 0x96, 0x17, 0x46, 0x5b, 0x6f, + 0x46, 0xe8, 0xfd, 0xe6, 0xd8, 0x7a, 0xd7, 0xb9, 0x7c, 0xa2, 0x73, 0x4e, 0xc1, 0x76, 0x51, 0xd9, + 0x6e, 0x26, 0x97, 0x2a, 0xa6, 0xf5, 0x7f, 0xce, 0x40, 0xf9, 0x30, 0xc2, 0x11, 0x39, 0x6d, 0x39, + 0x22, 0xe3, 0x62, 0x37, 0x3f, 0x82, 0xbc, 0x38, 0x25, 0xcc, 0xc0, 0xc1, 0x56, 0x5c, 0x9e, 0xec, + 0x8e, 0xbe, 0x42, 0x06, 0xe0, 0x74, 0x13, 0x1b, 0x1c, 0xcb, 0x15, 0x8c, 0x5a, 0xaa, 0xa2, 0xed, + 0xf0, 0xdd, 0x9b, 0xd0, 0x91, 0x0f, 0x05, 0xa9, 0x52, 0x3d, 0x0e, 0xd5, 0x89, 0xbd, 0x73, 0x45, + 0xa5, 0x86, 0x44, 0x93, 0x85, 0xab, 0xdf, 0x41, 0x41, 0x3f, 0xd5, 0x60, 0xc9, 0xf2, 0x3d, 0x5b, + 0x78, 0x04, 0x3b, 0x66, 0xc7, 0x82, 0xc5, 0x56, 0x95, 0xd7, 0xef, 0xfe, 0xab, 0xeb, 0xdf, 0x68, + 0x83, 0xf6, 0xae, 0x7b, 0x67, 0xc2, 0x58, 0xb0, 0x86, 0xb1, 0x87, 0x58, 0x14, 0x85, 0xb4, 0xd9, + 0x24, 0x21, 0xb1, 0xd5, 0x4d, 0x7e, 0x0d, 0x16, 0x1d, 0xc5, 0x90, 0x83, 0x2d, 0x4a, 0xd8, 0xe8, + 0x47, 0x1a, 0x2c, 0x38, 0xbe, 0xd7, 0x34, 0x23, 0x12, 0xba, 0x7d, 0x1e, 0x9a, 0x7a, 0xdd, 0xb4, + 0xd8, 0xf3, 0xbd, 0xe6, 0x11, 0x09, 0xdd, 0x01, 0xee, 0x99, 0x77, 0x06, 0xf2, 0xd0, 0xf7, 0xa1, + 0x14, 0xa7, 0x47, 0xdb, 0x80, 0x9c, 0x30, 0x60, 0xef, 0x8a, 0x06, 0x18, 0x6d, 0x44, 0x79, 0xe3, + 0xfb, 0x3d, 0xd4, 0xc5, 0xef, 0x41, 0x65, 0x58, 0x26, 0xa3, 0xcd, 0xb8, 0x6a, 0x79, 0xad, 0x32, + 0x48, 0xd5, 0x2c, 0x8b, 0x7f, 0xd4, 0x60, 0x7e, 0x70, 0xde, 0xa2, 0x87, 0x50, 0x14, 0x5b, 0x82, + 0xd8, 0x2a, 0x00, 0xc9, 0xa9, 0x77, 0xef, 0xd5, 0x74, 0xd5, 0x6d, 0x63, 0x56, 0x21, 0xa9, 0x31, + 0xfa, 0x00, 0xb2, 0xb2, 0x07, 0xa3, 0x1e, 0xec, 0x43, 0xea, 0x23, 0xd9, 0xb6, 0xa9, 0x76, 0x1a, + 0x66, 0x08, 0x31, 0x43, 0x89, 0x2f, 0x5a, 0xb0, 0x34, 0x22, 0xed, 0xaf, 0xc9, 0x49, 0x3f, 0xe8, + 0x57, 0xd2, 0x91, 0xc9, 0xe8, 0x53, 0x40, 0xc9, 0x5e, 0xb9, 0xba, 0xab, 0x8a, 0x09, 0x96, 0xa2, + 0xf0, 0x2c, 0x18, 0x96, 0xb8, 0xd7, 0xb4, 0xc0, 0x3f, 0x68, 0xb0, 0x38, 0x3c, 0x35, 0x91, 0x01, + 0x33, 0xbe, 0x73, 0x0d, 0x4b, 0x03, 0xdf, 0x49, 0x32, 0x60, 0xf3, 0x4a, 0x45, 0xb7, 0x32, 0x3c, + 0x69, 0x02, 0xc8, 0x7b, 0x65, 0x37, 0x93, 0x4b, 0x17, 0x33, 0xfa, 0x6f, 0x34, 0x40, 0xe2, 0xda, + 0xe9, 0x7e, 0x6a, 0xcf, 0x42, 0x2a, 0x69, 0xaa, 0xa4, 0xa8, 0x78, 0x08, 0xb1, 0x4b, 0xf7, 0xc4, + 0x77, 0xe4, 0x73, 0xd2, 0x50, 0x23, 0x5e, 0x58, 0x9c, 0x61, 0x66, 0xca, 0x66, 0x83, 0xa8, 0x3c, + 0x72, 0xc6, 0xf4, 0x19, 0x66, 0xf2, 0x1d, 0xdc, 0xdd, 0xa2, 0xc9, 0xf4, 0xb4, 0x68, 0xde, 0x84, + 0x12, 0x8e, 0x7c, 0x97, 0x5a, 0x66, 0x48, 0x98, 0xef, 0xb4, 0x78, 0xc6, 0x88, 0x03, 0xbd, 0x64, + 0x14, 0x25, 0xc3, 0x48, 0xe8, 0xfa, 0x9f, 0xd2, 0xf0, 0x95, 0xe4, 0x4a, 0x1e, 0xd4, 0x1c, 0xe8, + 0xb5, 0xf8, 0xe5, 0x75, 0xd3, 0x3c, 0x64, 0x79, 0x2d, 0x43, 0x42, 0x61, 0xf7, 0xb4, 0xa1, 0x46, + 0xa3, 0x8d, 0xde, 0x81, 0x2c, 0x8b, 0x70, 0xd4, 0x92, 0xd5, 0xe6, 0xec, 0x38, 0x81, 0xdd, 0x50, + 0x2a, 0x0f, 0x85, 0x9c, 0xa1, 0xe4, 0xd1, 0xb7, 0x60, 0x49, 0x55, 0xae, 0xa6, 0xe5, 0x7b, 0x17, + 0x24, 0x64, 0xfc, 0x21, 0x94, 0x34, 0x27, 0xb2, 0xc2, 0x11, 0x0b, 0x6a, 0xca, 0x46, 0x32, 0x23, + 0x6e, 0xbf, 0x0c, 0x76, 0xdf, 0xd4, 0x60, 0xf7, 0xa1, 0x37, 0xa0, 0x14, 0x97, 0x6e, 0xbc, 0x6e, + 0x32, 0xf9, 0x3f, 0x71, 0x32, 0x17, 0x8c, 0x1b, 0x31, 0xa3, 0x41, 0xc2, 0x23, 0x6a, 0x9d, 0xf3, + 0x17, 0x0b, 0x8b, 0x48, 0x60, 0x9e, 0x60, 0xd6, 0x51, 0x5c, 0x4f, 0xcb, 0x17, 0x0b, 0xe7, 0xd4, + 0x30, 0x6b, 0x97, 0xd6, 0x5f, 0x87, 0x59, 0x59, 0xad, 0xd2, 0xe8, 0xd2, 0x8c, 0x28, 0x09, 0x2b, + 0x20, 0x60, 0x0b, 0x09, 0xf5, 0x88, 0x92, 0xf0, 0xfd, 0x54, 0x45, 0xd3, 0x7f, 0x91, 0x19, 0x19, + 0xc3, 0xb5, 0xff, 0xc7, 0xf0, 0xbf, 0x3a, 0x86, 0xe8, 0x01, 0xe4, 0x95, 0x53, 0x45, 0xfb, 0x38, + 0x2f, 0x9c, 0x37, 0x46, 0x55, 0xdf, 0x13, 0x73, 0xd1, 0x43, 0x06, 0x37, 0xf9, 0xaf, 0xff, 0x3a, + 0x05, 0x8b, 0x7b, 0x9d, 0x9a, 0x8e, 0x03, 0x46, 0xc2, 0x68, 0xd8, 0xce, 0x46, 0x90, 0xf1, 0xb0, + 0x4b, 0xd4, 0x49, 0x24, 0xfe, 0xf3, 0xf5, 0x52, 0x8f, 0x46, 0x14, 0x3b, 0xfc, 0x2c, 0x6a, 0x52, + 0x4f, 0x34, 0x18, 0xe5, 0x4b, 0xa8, 0xa8, 0x38, 0xfb, 0x82, 0xd1, 0x08, 0x5c, 0xf4, 0x1e, 0x54, + 0x5c, 0x4c, 0xbd, 0x88, 0x78, 0xd8, 0xb3, 0x88, 0x79, 0x1a, 0x62, 0x4b, 0x74, 0x21, 0xb8, 0x8c, + 0x4c, 0x96, 0xf9, 0x0e, 0xfe, 0xb6, 0x62, 0x4b, 0xc9, 0x79, 0xe1, 0xd2, 0xb8, 0xf2, 0x37, 0x3d, + 0x5f, 0x5e, 0x74, 0xf2, 0xf1, 0xc9, 0x4b, 0x66, 0xa3, 0xcc, 0x67, 0xc4, 0x55, 0xfc, 0x81, 0xe2, + 0xef, 0x66, 0x72, 0xd9, 0xe2, 0xd4, 0x6e, 0x26, 0x37, 0x55, 0xcc, 0x19, 0xb7, 0xfc, 0x80, 0x78, + 0x26, 0x57, 0x10, 0x12, 0x16, 0x99, 0x8e, 0xff, 0x98, 0x84, 0xa6, 0x85, 0x83, 0x5e, 0x46, 0x2b, + 0x08, 0x24, 0x43, 0xff, 0x55, 0x0a, 0xe6, 0xe4, 0x23, 0x2b, 0xce, 0xc4, 0xd8, 0x3b, 0xbd, 0x7b, + 0x44, 0xeb, 0xdb, 0x23, 0xed, 0x74, 0x4f, 0x7d, 0xb9, 0xe9, 0x9e, 0x7e, 0x59, 0xba, 0x0f, 0xcc, + 0xe0, 0xcc, 0xab, 0x64, 0xf0, 0xe4, 0xe0, 0x0c, 0xd6, 0x7f, 0xa7, 0xc1, 0xbc, 0xf4, 0x4f, 0x92, + 0x6c, 0x23, 0xae, 0x32, 0x75, 0x64, 0xa4, 0x86, 0x1f, 0x19, 0xe9, 0x71, 0xee, 0xaa, 0xcc, 0x90, + 0x8d, 0xda, 0xbf, 0x9d, 0x26, 0x07, 0x6c, 0x27, 0x9d, 0xc1, 0xdc, 0x51, 0x88, 0x6d, 0xea, 0x35, + 0x0d, 0xf2, 0x18, 0x87, 0x36, 0x6b, 0xbf, 0x9f, 0x6f, 0x44, 0x92, 0x61, 0x86, 0x92, 0xa3, 0xbe, + 0xfa, 0xac, 0x8e, 0x2c, 0xa2, 0x55, 0x5b, 0xb7, 0x0b, 0xd3, 0x98, 0x8d, 0xba, 0x54, 0xe8, 0xbf, + 0xd4, 0xa0, 0x3c, 0x68, 0x22, 0x2a, 0xc3, 0xa4, 0xff, 0xd8, 0x23, 0x71, 0xe7, 0x5e, 0x0e, 0xd0, + 0x39, 0xcc, 0xd8, 0xc4, 0xf3, 0xdd, 0xb8, 0x19, 0x93, 0xba, 0xe6, 0x2f, 0x5f, 0x79, 0x81, 0x2e, + 0xfb, 0x3a, 0xfa, 0x0f, 0x35, 0x58, 0xb8, 0x1f, 0x10, 0xaf, 0xae, 0xf2, 0xbf, 0xbb, 0xab, 0x60, + 0xc1, 0x5c, 0xef, 0xee, 0xe8, 0xfc, 0x22, 0x36, 0xba, 0x6b, 0xd8, 0x0f, 0x6b, 0xdc, 0xf4, 0xfb, + 0x68, 0x4c, 0x5c, 0x53, 0x9f, 0x69, 0x80, 0xfa, 0xe7, 0x8f, 0xf3, 0x51, 0xd1, 0x85, 0x42, 0x97, + 0x89, 0xd7, 0xee, 0xae, 0x99, 0x4e, 0x9b, 0x85, 0xb1, 0xcf, 0x46, 0x9d, 0x9d, 0x6b, 0xff, 0x1b, + 0x67, 0x27, 0x7a, 0x17, 0x86, 0x9d, 0x98, 0xaa, 0x2f, 0x55, 0xee, 0xf4, 0xcb, 0x1e, 0x67, 0x6e, + 0xe0, 0xa0, 0x5f, 0x2c, 0x39, 0x4f, 0x55, 0xb7, 0xb6, 0xdc, 0x9d, 0x02, 0x81, 0x10, 0xab, 0x19, + 0x9f, 0x3f, 0x5f, 0xd6, 0x9e, 0x3d, 0x5f, 0xd6, 0xfe, 0xf5, 0x7c, 0x59, 0xfb, 0xd9, 0x8b, 0xe5, + 0x89, 0x67, 0x2f, 0x96, 0x27, 0xfe, 0xfe, 0x62, 0x79, 0xe2, 0xe1, 0x7b, 0xe3, 0x07, 0xb0, 0xfb, + 0x23, 0xfe, 0x49, 0x56, 0x30, 0xbe, 0xf1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6b, 0x3d, 0xa2, + 0x96, 0xea, 0x1f, 0x00, 0x00, } func (m *FundingUpdateV1) Marshal() (dAtA []byte, err error) { diff --git a/protocol/x/clob/e2e/long_term_orders_test.go b/protocol/x/clob/e2e/long_term_orders_test.go index 3d0b69226b..685d2383f3 100644 --- a/protocol/x/clob/e2e/long_term_orders_test.go +++ b/protocol/x/clob/e2e/long_term_orders_test.go @@ -824,22 +824,6 @@ func TestPlaceLongTermOrder(t *testing.T) { EventIndex: 2, Version: indexerevents.OrderFillEventVersion, }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewInt(10_000_000_000), - }, - }, - }), - }, }, TxHashes: []string{ string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ @@ -1167,22 +1151,6 @@ func TestPlaceLongTermOrder(t *testing.T) { EventIndex: 2, Version: indexerevents.OrderFillEventVersion, }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewInt(10_000_000_000), - }, - }, - }), - }, }, TxHashes: []string{ string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ @@ -1337,22 +1305,6 @@ func TestPlaceLongTermOrder(t *testing.T) { EventIndex: 2, Version: indexerevents.OrderFillEventVersion, }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewInt(20_000_000_000), - }, - }, - }), - }, }, TxHashes: []string{ string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ @@ -1735,22 +1687,6 @@ func TestRegression_InvalidTimeInForce(t *testing.T) { EventIndex: 2, Version: indexerevents.OrderFillEventVersion, }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewInt(10_000_000_000), - }, - }, - }), - }, }, TxHashes: []string{ string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ diff --git a/protocol/x/clob/e2e/short_term_orders_test.go b/protocol/x/clob/e2e/short_term_orders_test.go index 8a3ee3e374..48fae5483c 100644 --- a/protocol/x/clob/e2e/short_term_orders_test.go +++ b/protocol/x/clob/e2e/short_term_orders_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/slices" - "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" @@ -218,24 +217,6 @@ func TestPlaceOrder(t *testing.T) { ), ), }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewIntFromUint64( - PlaceOrder_Alice_Num0_Id0_Clob0_Buy5_Price10_GTB20.Order.GetBigQuantums().Uint64(), - ), - }, - }, - }), - }, }, TxHashes: []string{string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ OperationsQueue: []clobtypes.OperationRaw{ @@ -397,24 +378,6 @@ func TestPlaceOrder(t *testing.T) { ), ), }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewIntFromUint64( - PlaceOrder_Bob_Num0_Id0_Clob0_Sell5_Price10_GTB20.Order.GetBigQuantums().Uint64(), - ), - }, - }, - }), - }, }, TxHashes: []string{string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ OperationsQueue: []clobtypes.OperationRaw{ @@ -576,24 +539,6 @@ func TestPlaceOrder(t *testing.T) { ), ), }, - { - Subtype: indexerevents.SubtypeOpenInterestUpdate, - OrderingWithinBlock: &indexer_manager.IndexerTendermintEvent_BlockEvent_{ - BlockEvent: indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - }, - Version: indexerevents.OpenInterestUpdateVersion, - DataBytes: indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: []*indexerevents.OpenInterestUpdate{ - { - PerpetualId: Clob_0.MustGetPerpetualId(), - OpenInterest: dtypes.NewIntFromUint64( - PlaceOrder_Bob_Num0_Id0_Clob0_Sell5_Price10_GTB20.Order.GetBigQuantums().Uint64(), - ), - }, - }, - }), - }, }, TxHashes: []string{string(lib.GetTxHash(testtx.MustGetTxBytes(&clobtypes.MsgProposedOperations{ OperationsQueue: []clobtypes.OperationRaw{ diff --git a/protocol/x/perpetuals/abci.go b/protocol/x/perpetuals/abci.go index e8149df9a9..57a34f9e0c 100644 --- a/protocol/x/perpetuals/abci.go +++ b/protocol/x/perpetuals/abci.go @@ -15,5 +15,4 @@ func EndBlocker(ctx sdk.Context, k types.PerpetualsKeeper) { // first so that new samples are processed in `MaybeProcessNewFundingTickEpoch`. k.MaybeProcessNewFundingSampleEpoch(ctx) k.MaybeProcessNewFundingTickEpoch(ctx) - k.SendOIUpdatesToIndexer(ctx) } diff --git a/protocol/x/perpetuals/abci_test.go b/protocol/x/perpetuals/abci_test.go index e50a03080f..04ed81320f 100644 --- a/protocol/x/perpetuals/abci_test.go +++ b/protocol/x/perpetuals/abci_test.go @@ -28,10 +28,6 @@ func TestEndBlocker(t *testing.T) { "MaybeProcessNewFundingSampleEpoch", ctx, ).Return(nil) - mck.On( - "SendOIUpdatesToIndexer", - ctx, - ) }, expectedErr: nil, }, diff --git a/protocol/x/perpetuals/keeper/perpetual.go b/protocol/x/perpetuals/keeper/perpetual.go index c288f17982..834f67e96a 100644 --- a/protocol/x/perpetuals/keeper/perpetual.go +++ b/protocol/x/perpetuals/keeper/perpetual.go @@ -1,7 +1,6 @@ package keeper import ( - "encoding/binary" "fmt" "math/big" "math/rand" @@ -1041,14 +1040,6 @@ func (k Keeper) ModifyOpenInterest( perpetual.OpenInterest = dtypes.NewIntFromBigInt(bigOpenInterest) k.setPerpetual(ctx, perpetual) - if ctx.ExecMode() == sdk.ExecModeFinalize { - updatedOIStore := prefix.NewStore(ctx.TransientStore(k.transientStoreKey), []byte(types.UpdatedOIKeyPrefix)) - openInterestInBytes, err := perpetual.OpenInterest.Marshal() - if err != nil { - return err - } - updatedOIStore.Set(lib.Uint32ToKey(perpetualId), openInterestInBytes) - } return nil } @@ -1481,42 +1472,6 @@ func (k Keeper) IsPositionUpdatable( return true, nil } -func (k Keeper) SendOIUpdatesToIndexer(ctx sdk.Context) { - updatedOIStore := prefix.NewStore(ctx.TransientStore(k.transientStoreKey), []byte(types.UpdatedOIKeyPrefix)) - iterator := updatedOIStore.Iterator(nil, nil) - defer iterator.Close() - - OIMessageArray := make([]*indexerevents.OpenInterestUpdate, 0) - - for ; iterator.Valid(); iterator.Next() { - openInterestSerializableInt := dtypes.SerializableInt{} - if err := openInterestSerializableInt.Unmarshal(iterator.Value()); err != nil { - panic(errorsmod.Wrap(err, "failed to unmarshal open interest")) - } - OIMessage := indexerevents.OpenInterestUpdate{ - PerpetualId: binary.BigEndian.Uint32(iterator.Key()), - OpenInterest: openInterestSerializableInt, - } - OIMessageArray = append(OIMessageArray, &OIMessage) - } - - if len(OIMessageArray) == 0 { - return - } - - k.GetIndexerEventManager().AddBlockEvent( - ctx, - indexerevents.SubtypeOpenInterestUpdate, - indexer_manager.IndexerTendermintEvent_BLOCK_EVENT_END_BLOCK, - indexerevents.OpenInterestUpdateVersion, - indexer_manager.GetBytes( - &indexerevents.OpenInterestUpdateEventV1{ - OpenInterestUpdates: OIMessageArray, - }, - ), - ) -} - // GetNextPerpetualID returns the next perpetual id to be used from the module store func (k Keeper) GetNextPerpetualID(ctx sdk.Context) uint32 { store := ctx.KVStore(k.storeKey) diff --git a/protocol/x/perpetuals/keeper/perpetual_test.go b/protocol/x/perpetuals/keeper/perpetual_test.go index e3859b83e4..30cce2fa32 100644 --- a/protocol/x/perpetuals/keeper/perpetual_test.go +++ b/protocol/x/perpetuals/keeper/perpetual_test.go @@ -3013,32 +3013,6 @@ func TestIsPositionUpdatable(t *testing.T) { } } -func TestModifyOpenInterest_store(t *testing.T) { - pc := keepertest.PerpetualsKeepers(t) - perps := keepertest.CreateLiquidityTiersAndNPerpetuals(t, pc.Ctx, pc.PerpetualsKeeper, pc.PricesKeeper, 100) - pc.Ctx = pc.Ctx.WithExecMode(sdk.ExecModeFinalize) - for _, perp := range perps { - openInterestDeltaBaseQuantums := big.NewInt(2_000_000 * (int64(perp.Params.Id))) - - err := pc.PerpetualsKeeper.ModifyOpenInterest( - pc.Ctx, - perp.Params.Id, - openInterestDeltaBaseQuantums, - ) - require.NoError(t, err) - } - - transientStore := prefix.NewStore(pc.Ctx.TransientStore(pc.TransientStoreKey), []byte(types.UpdatedOIKeyPrefix)) - for _, perp := range perps { - perpetualObject, err := pc.PerpetualsKeeper.GetPerpetual(pc.Ctx, perp.Params.Id) - require.NoError(t, err) - serializedOpenInterest := dtypes.SerializableInt{} - err = serializedOpenInterest.Unmarshal(transientStore.Get(lib.Uint32ToKey(perpetualObject.Params.Id))) - require.NoError(t, err) - require.Equal(t, perpetualObject.OpenInterest, serializedOpenInterest) - } -} - func TestIsIsolatedPerpetual(t *testing.T) { testCases := map[string]struct { perp types.Perpetual diff --git a/protocol/x/perpetuals/types/types.go b/protocol/x/perpetuals/types/types.go index 0da2437d97..7268ec81a9 100644 --- a/protocol/x/perpetuals/types/types.go +++ b/protocol/x/perpetuals/types/types.go @@ -114,7 +114,6 @@ type PerpetualsKeeper interface { ctx sdk.Context, ) []Perpetual GetAllLiquidityTiers(ctx sdk.Context) (list []LiquidityTier) - SendOIUpdatesToIndexer(ctx sdk.Context) ValidateAndSetPerpetual( ctx sdk.Context, perpetual Perpetual,