From 4b3b08e6476dcdf28936ed711aefbb848e89b57a Mon Sep 17 00:00:00 2001 From: Christopher-Li Date: Fri, 8 Dec 2023 16:13:04 -0500 Subject: [PATCH] Rename TradingRewardEventV1 name and denom field (#869) * Rename TradingRewardEventV1 name and denom field * fix format --------- Co-authored-by: Roy Li --- .../dydxprotocol/indexer/events/events.ts | 44 +-- .../dydxprotocol/indexer/events/events.proto | 10 +- protocol/indexer/events/events.pb.go | 324 +++++++++--------- 3 files changed, 189 insertions(+), 189 deletions(-) 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 301302e51c..4de55fd505 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 @@ -1131,20 +1131,20 @@ export interface UpdatePerpetualEventV1SDKType { liquidity_tier: number; } /** - * TradingRewardEventV1 is communicates all trading rewards for all accounts + * TradingRewardsEventV1 is communicates all trading rewards for all accounts * that receive trade rewards in the block. */ -export interface TradingRewardEventV1 { +export interface TradingRewardsEventV1 { /** The list of all trading rewards in the block. */ tradingRewards: AddressTradingReward[]; } /** - * TradingRewardEventV1 is communicates all trading rewards for all accounts + * TradingRewardsEventV1 is communicates all trading rewards for all accounts * that receive trade rewards in the block. */ -export interface TradingRewardEventV1SDKType { +export interface TradingRewardsEventV1SDKType { /** The list of all trading rewards in the block. */ trading_rewards: AddressTradingRewardSDKType[]; } @@ -1157,11 +1157,11 @@ export interface AddressTradingReward { /** The address of the wallet that will receive the trading reward. */ owner: string; /** - * The trading rewards earned by the address above in denoms. 1e18 denoms is - * equivalent to a single coin. + * The amount of trading rewards earned by the address above in denoms. 1e18 + * denoms is equivalent to a single coin. */ - denoms: Uint8Array; + denomAmount: Uint8Array; } /** * AddressTradingReward contains info on an instance of an address receiving a @@ -1172,11 +1172,11 @@ export interface AddressTradingRewardSDKType { /** The address of the wallet that will receive the trading reward. */ owner: string; /** - * The trading rewards earned by the address above in denoms. 1e18 denoms is - * equivalent to a single coin. + * The amount of trading rewards earned by the address above in denoms. 1e18 + * denoms is equivalent to a single coin. */ - denoms: Uint8Array; + denom_amount: Uint8Array; } function createBaseFundingUpdateV1(): FundingUpdateV1 { @@ -2899,14 +2899,14 @@ export const UpdatePerpetualEventV1 = { }; -function createBaseTradingRewardEventV1(): TradingRewardEventV1 { +function createBaseTradingRewardsEventV1(): TradingRewardsEventV1 { return { tradingRewards: [] }; } -export const TradingRewardEventV1 = { - encode(message: TradingRewardEventV1, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { +export const TradingRewardsEventV1 = { + encode(message: TradingRewardsEventV1, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { for (const v of message.tradingRewards) { AddressTradingReward.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2914,10 +2914,10 @@ export const TradingRewardEventV1 = { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TradingRewardEventV1 { + decode(input: _m0.Reader | Uint8Array, length?: number): TradingRewardsEventV1 { const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); let end = length === undefined ? reader.len : reader.pos + length; - const message = createBaseTradingRewardEventV1(); + const message = createBaseTradingRewardsEventV1(); while (reader.pos < end) { const tag = reader.uint32(); @@ -2936,8 +2936,8 @@ export const TradingRewardEventV1 = { return message; }, - fromPartial(object: DeepPartial): TradingRewardEventV1 { - const message = createBaseTradingRewardEventV1(); + fromPartial(object: DeepPartial): TradingRewardsEventV1 { + const message = createBaseTradingRewardsEventV1(); message.tradingRewards = object.tradingRewards?.map(e => AddressTradingReward.fromPartial(e)) || []; return message; } @@ -2947,7 +2947,7 @@ export const TradingRewardEventV1 = { function createBaseAddressTradingReward(): AddressTradingReward { return { owner: "", - denoms: new Uint8Array() + denomAmount: new Uint8Array() }; } @@ -2957,8 +2957,8 @@ export const AddressTradingReward = { writer.uint32(10).string(message.owner); } - if (message.denoms.length !== 0) { - writer.uint32(18).bytes(message.denoms); + if (message.denomAmount.length !== 0) { + writer.uint32(18).bytes(message.denomAmount); } return writer; @@ -2978,7 +2978,7 @@ export const AddressTradingReward = { break; case 2: - message.denoms = reader.bytes(); + message.denomAmount = reader.bytes(); break; default: @@ -2993,7 +2993,7 @@ export const AddressTradingReward = { fromPartial(object: DeepPartial): AddressTradingReward { const message = createBaseAddressTradingReward(); message.owner = object.owner ?? ""; - message.denoms = object.denoms ?? new Uint8Array(); + message.denomAmount = object.denomAmount ?? new Uint8Array(); return message; } diff --git a/proto/dydxprotocol/indexer/events/events.proto b/proto/dydxprotocol/indexer/events/events.proto index ed0f12c35b..bdbed11fe6 100644 --- a/proto/dydxprotocol/indexer/events/events.proto +++ b/proto/dydxprotocol/indexer/events/events.proto @@ -431,9 +431,9 @@ message UpdatePerpetualEventV1 { uint32 liquidity_tier = 5; } -// TradingRewardEventV1 is communicates all trading rewards for all accounts +// TradingRewardsEventV1 is communicates all trading rewards for all accounts // that receive trade rewards in the block. -message TradingRewardEventV1 { +message TradingRewardsEventV1 { // The list of all trading rewards in the block. repeated AddressTradingReward trading_rewards = 1; } @@ -444,9 +444,9 @@ message AddressTradingReward { // The address of the wallet that will receive the trading reward. string owner = 1; - // The trading rewards earned by the address above in denoms. 1e18 denoms is - // equivalent to a single coin. - bytes denoms = 2 [ + // The amount of trading rewards earned by the address above in denoms. 1e18 + // denoms is equivalent to a single coin. + bytes denom_amount = 2 [ (gogoproto.customtype) = "github.com/dydxprotocol/v4-chain/protocol/dtypes.SerializableInt", (gogoproto.nullable) = false diff --git a/protocol/indexer/events/events.pb.go b/protocol/indexer/events/events.pb.go index ec62df42db..079b3b6091 100644 --- a/protocol/indexer/events/events.pb.go +++ b/protocol/indexer/events/events.pb.go @@ -2004,25 +2004,25 @@ func (m *UpdatePerpetualEventV1) GetLiquidityTier() uint32 { return 0 } -// TradingRewardEventV1 is communicates all trading rewards for all accounts +// TradingRewardsEventV1 is communicates all trading rewards for all accounts // that receive trade rewards in the block. -type TradingRewardEventV1 struct { +type TradingRewardsEventV1 struct { // The list of all trading rewards in the block. TradingRewards []*AddressTradingReward `protobuf:"bytes,1,rep,name=trading_rewards,json=tradingRewards,proto3" json:"trading_rewards,omitempty"` } -func (m *TradingRewardEventV1) Reset() { *m = TradingRewardEventV1{} } -func (m *TradingRewardEventV1) String() string { return proto.CompactTextString(m) } -func (*TradingRewardEventV1) ProtoMessage() {} -func (*TradingRewardEventV1) Descriptor() ([]byte, []int) { +func (m *TradingRewardsEventV1) Reset() { *m = TradingRewardsEventV1{} } +func (m *TradingRewardsEventV1) String() string { return proto.CompactTextString(m) } +func (*TradingRewardsEventV1) ProtoMessage() {} +func (*TradingRewardsEventV1) Descriptor() ([]byte, []int) { return fileDescriptor_6331dfb59c6fd2bb, []int{19} } -func (m *TradingRewardEventV1) XXX_Unmarshal(b []byte) error { +func (m *TradingRewardsEventV1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *TradingRewardEventV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *TradingRewardsEventV1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_TradingRewardEventV1.Marshal(b, m, deterministic) + return xxx_messageInfo_TradingRewardsEventV1.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -2032,19 +2032,19 @@ func (m *TradingRewardEventV1) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (m *TradingRewardEventV1) XXX_Merge(src proto.Message) { - xxx_messageInfo_TradingRewardEventV1.Merge(m, src) +func (m *TradingRewardsEventV1) XXX_Merge(src proto.Message) { + xxx_messageInfo_TradingRewardsEventV1.Merge(m, src) } -func (m *TradingRewardEventV1) XXX_Size() int { +func (m *TradingRewardsEventV1) XXX_Size() int { return m.Size() } -func (m *TradingRewardEventV1) XXX_DiscardUnknown() { - xxx_messageInfo_TradingRewardEventV1.DiscardUnknown(m) +func (m *TradingRewardsEventV1) XXX_DiscardUnknown() { + xxx_messageInfo_TradingRewardsEventV1.DiscardUnknown(m) } -var xxx_messageInfo_TradingRewardEventV1 proto.InternalMessageInfo +var xxx_messageInfo_TradingRewardsEventV1 proto.InternalMessageInfo -func (m *TradingRewardEventV1) GetTradingRewards() []*AddressTradingReward { +func (m *TradingRewardsEventV1) GetTradingRewards() []*AddressTradingReward { if m != nil { return m.TradingRewards } @@ -2056,9 +2056,9 @@ func (m *TradingRewardEventV1) GetTradingRewards() []*AddressTradingReward { type AddressTradingReward struct { // The address of the wallet that will receive the trading reward. Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` - // The trading rewards earned by the address above in denoms. 1e18 denoms is - // equivalent to a single coin. - Denoms github_com_dydxprotocol_v4_chain_protocol_dtypes.SerializableInt `protobuf:"bytes,2,opt,name=denoms,proto3,customtype=github.com/dydxprotocol/v4-chain/protocol/dtypes.SerializableInt" json:"denoms"` + // The amount of trading rewards earned by the address above in denoms. 1e18 + // denoms is equivalent to a single coin. + DenomAmount github_com_dydxprotocol_v4_chain_protocol_dtypes.SerializableInt `protobuf:"bytes,2,opt,name=denom_amount,json=denomAmount,proto3,customtype=github.com/dydxprotocol/v4-chain/protocol/dtypes.SerializableInt" json:"denom_amount"` } func (m *AddressTradingReward) Reset() { *m = AddressTradingReward{} } @@ -2127,7 +2127,7 @@ func init() { proto.RegisterType((*LiquidityTierUpsertEventV1)(nil), "dydxprotocol.indexer.events.LiquidityTierUpsertEventV1") proto.RegisterType((*UpdateClobPairEventV1)(nil), "dydxprotocol.indexer.events.UpdateClobPairEventV1") proto.RegisterType((*UpdatePerpetualEventV1)(nil), "dydxprotocol.indexer.events.UpdatePerpetualEventV1") - proto.RegisterType((*TradingRewardEventV1)(nil), "dydxprotocol.indexer.events.TradingRewardEventV1") + proto.RegisterType((*TradingRewardsEventV1)(nil), "dydxprotocol.indexer.events.TradingRewardsEventV1") proto.RegisterType((*AddressTradingReward)(nil), "dydxprotocol.indexer.events.AddressTradingReward") } @@ -2136,137 +2136,137 @@ func init() { } var fileDescriptor_6331dfb59c6fd2bb = []byte{ - // 2066 bytes of a gzipped FileDescriptorProto + // 2071 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xbd, 0x6f, 0x1b, 0xc9, - 0x15, 0x17, 0x3f, 0x44, 0x51, 0x4f, 0xa2, 0x4c, 0x8e, 0x69, 0x99, 0x92, 0x12, 0xd9, 0x59, 0x20, - 0x80, 0xe1, 0xbb, 0xa3, 0x2c, 0xc7, 0x09, 0x0e, 0x29, 0x82, 0x88, 0x12, 0x75, 0xa2, 0x61, 0xc9, - 0xcc, 0x92, 0xf2, 0xdd, 0x39, 0xc1, 0xed, 0x8d, 0x76, 0x87, 0xd4, 0xc0, 0xfb, 0x75, 0x33, 0x4b, - 0xd9, 0x32, 0x90, 0x3a, 0xa9, 0x92, 0x00, 0xa9, 0x53, 0xa4, 0x48, 0x13, 0x20, 0x45, 0x80, 0xb4, - 0x57, 0xa5, 0xb9, 0x2e, 0x87, 0x34, 0x09, 0x52, 0x18, 0x81, 0x5d, 0xa4, 0xcd, 0x9f, 0x70, 0x98, - 0x8f, 0x5d, 0x92, 0xe2, 0x87, 0x69, 0x5b, 0x57, 0x89, 0xf3, 0xde, 0xbc, 0xdf, 0xfb, 0x9c, 0x79, - 0x6f, 0x56, 0x70, 0xcb, 0x39, 0x77, 0x9e, 0x85, 0x2c, 0x88, 0x02, 0x3b, 0x70, 0xb7, 0xa8, 0xef, - 0x90, 0x67, 0x84, 0x6d, 0x91, 0x33, 0xe2, 0x47, 0x5c, 0xff, 0xa9, 0x4a, 0x36, 0xda, 0x18, 0xdc, - 0x59, 0xd5, 0x3b, 0xab, 0x6a, 0xcb, 0xfa, 0x9a, 0x1d, 0x70, 0x2f, 0xe0, 0x96, 0xe4, 0x6f, 0xa9, - 0x85, 0x92, 0x5b, 0x2f, 0x77, 0x83, 0x6e, 0xa0, 0xe8, 0xe2, 0x97, 0xa6, 0xde, 0x19, 0xab, 0x97, - 0x9f, 0x62, 0x46, 0x9c, 0x2d, 0x46, 0xbc, 0xe0, 0x0c, 0xbb, 0x16, 0x23, 0x98, 0x07, 0xbe, 0x96, - 0x78, 0x6f, 0xac, 0x44, 0x42, 0x38, 0xdb, 0xde, 0xb2, 0xdd, 0xe0, 0x44, 0x6f, 0xde, 0x7e, 0xed, - 0x66, 0xde, 0x3b, 0xc1, 0xb6, 0x1d, 0xf4, 0xfc, 0x48, 0x89, 0x18, 0xff, 0x48, 0xc1, 0x95, 0xfd, - 0x9e, 0xef, 0x50, 0xbf, 0x7b, 0x1c, 0x3a, 0x38, 0x22, 0x8f, 0xb6, 0xd1, 0xf7, 0x60, 0x39, 0x24, - 0x2c, 0x24, 0x51, 0x0f, 0xbb, 0x16, 0x75, 0x2a, 0xa9, 0x9b, 0xa9, 0x5b, 0x05, 0x73, 0x29, 0xa1, - 0x35, 0x1c, 0x74, 0x1b, 0x4a, 0x1d, 0x25, 0x65, 0x9d, 0x61, 0xb7, 0x47, 0xac, 0x30, 0xf4, 0x2a, - 0xe9, 0x9b, 0xa9, 0x5b, 0xf3, 0xe6, 0x15, 0xcd, 0x78, 0x24, 0xe8, 0xcd, 0xd0, 0x43, 0x1e, 0x14, - 0xe2, 0xbd, 0xd2, 0xa4, 0x4a, 0xe6, 0x66, 0xea, 0xd6, 0x72, 0xed, 0xe0, 0xab, 0x17, 0x37, 0xe6, - 0xfe, 0xf3, 0xe2, 0xc6, 0x4f, 0xbb, 0x34, 0x3a, 0xed, 0x9d, 0x54, 0xed, 0xc0, 0xdb, 0x1a, 0xb2, - 0xff, 0xec, 0xde, 0x07, 0xf6, 0x29, 0xa6, 0x7e, 0xdf, 0x01, 0x27, 0x3a, 0x0f, 0x09, 0xaf, 0xb6, - 0x08, 0xa3, 0xd8, 0xa5, 0xcf, 0xf1, 0x89, 0x4b, 0x1a, 0x7e, 0x64, 0x2e, 0x6b, 0xf8, 0x86, 0x40, - 0x37, 0x7e, 0x9f, 0x86, 0x15, 0xed, 0x51, 0x5d, 0xa4, 0xe9, 0xd1, 0x36, 0x7a, 0x00, 0x0b, 0x3d, - 0xe9, 0x1c, 0xaf, 0xa4, 0x6e, 0x66, 0x6e, 0x2d, 0xdd, 0x7d, 0xbf, 0x3a, 0x25, 0xad, 0xd5, 0x0b, - 0xf1, 0xa8, 0x65, 0x85, 0xa5, 0x66, 0x0c, 0x81, 0xf6, 0x20, 0x2b, 0xec, 0x90, 0xee, 0xae, 0xdc, - 0xbd, 0x33, 0x0b, 0x94, 0x36, 0xa4, 0xda, 0x3e, 0x0f, 0x89, 0x29, 0xa5, 0x0d, 0x0f, 0xb2, 0x62, - 0x85, 0xca, 0x50, 0x6c, 0x7f, 0xda, 0xac, 0x5b, 0xc7, 0x47, 0xad, 0x66, 0x7d, 0xb7, 0xb1, 0xdf, - 0xa8, 0xef, 0x15, 0xe7, 0xd0, 0x75, 0xb8, 0x2a, 0xa9, 0x4d, 0xb3, 0x7e, 0xd8, 0x38, 0x3e, 0xb4, - 0x5a, 0x3b, 0x87, 0xcd, 0x07, 0xf5, 0x62, 0x0a, 0xdd, 0x80, 0x0d, 0xc9, 0xd8, 0x3f, 0x3e, 0xda, - 0x6b, 0x1c, 0x7d, 0x64, 0x99, 0x3b, 0xed, 0xba, 0xb5, 0x73, 0xb4, 0x67, 0x35, 0x8e, 0xf6, 0xea, - 0x9f, 0x14, 0xd3, 0xe8, 0x1a, 0x94, 0x86, 0x24, 0x1f, 0x3d, 0x6c, 0xd7, 0x8b, 0x19, 0xe3, 0xef, - 0x69, 0x28, 0x1c, 0x62, 0xf6, 0x84, 0x44, 0x71, 0x50, 0x36, 0x60, 0xd1, 0x93, 0x84, 0x7e, 0x8a, - 0xf3, 0x8a, 0xd0, 0x70, 0xd0, 0x63, 0x58, 0x0e, 0x19, 0xb5, 0x89, 0xa5, 0x9c, 0x96, 0xbe, 0x2e, - 0xdd, 0xfd, 0xe1, 0x54, 0x5f, 0x15, 0x7c, 0x53, 0x88, 0xa9, 0xd0, 0x69, 0x4d, 0x07, 0x73, 0xe6, - 0x52, 0xd8, 0xa7, 0xa2, 0x8f, 0xa1, 0xa0, 0x15, 0xdb, 0x8c, 0x08, 0xf0, 0x8c, 0x04, 0xbf, 0x33, - 0x03, 0xf8, 0xae, 0x14, 0xe8, 0xe3, 0x2e, 0x7b, 0x03, 0xe4, 0x01, 0x60, 0x2f, 0x70, 0x68, 0xe7, - 0xbc, 0x92, 0x9d, 0x19, 0xf8, 0x50, 0x0a, 0x8c, 0x00, 0x2b, 0x72, 0x6d, 0x01, 0xe6, 0xe5, 0x6e, - 0xe3, 0x3e, 0x54, 0x26, 0x79, 0x89, 0xaa, 0x70, 0x55, 0x85, 0xec, 0x29, 0x8d, 0x4e, 0x2d, 0xf2, - 0x2c, 0x0c, 0x7c, 0xe2, 0x47, 0x32, 0xb2, 0x59, 0xb3, 0x24, 0x59, 0x1f, 0xd3, 0xe8, 0xb4, 0xae, - 0x19, 0xc6, 0x27, 0x50, 0x52, 0x58, 0x35, 0xcc, 0x13, 0x10, 0x04, 0xd9, 0x10, 0x53, 0x26, 0xa5, - 0x16, 0x4d, 0xf9, 0x1b, 0x6d, 0x41, 0xd9, 0xa3, 0xbe, 0xa5, 0xc0, 0xed, 0x53, 0xec, 0x77, 0xfb, - 0xc7, 0xad, 0x60, 0x96, 0x3c, 0xea, 0x4b, 0x6b, 0x76, 0x25, 0xa7, 0x19, 0x7a, 0x46, 0x0f, 0xae, - 0x8e, 0x09, 0x17, 0xaa, 0x41, 0xf6, 0x04, 0x73, 0x22, 0xb1, 0x97, 0xee, 0x56, 0x67, 0x88, 0xca, - 0x80, 0x65, 0xa6, 0x94, 0x45, 0xeb, 0x90, 0x4f, 0x3c, 0x13, 0xfa, 0x4b, 0x66, 0xb2, 0x36, 0x3e, - 0x8d, 0xd5, 0x0e, 0x05, 0xf3, 0x32, 0xd4, 0x1a, 0x7f, 0x49, 0x41, 0xa1, 0x15, 0xf4, 0x98, 0x4d, - 0x1e, 0x76, 0xc4, 0x91, 0xe2, 0xe8, 0x17, 0x50, 0xe8, 0xdf, 0x65, 0x71, 0x05, 0x4f, 0xac, 0xd0, - 0x84, 0x70, 0xb6, 0x5d, 0x6d, 0x28, 0x5a, 0x2b, 0x91, 0x6e, 0x38, 0x22, 0xe1, 0x7c, 0x60, 0x8d, - 0xee, 0xc1, 0x02, 0x76, 0x1c, 0x46, 0x38, 0x97, 0x5e, 0x2e, 0xd6, 0x2a, 0xff, 0xfc, 0xdb, 0x07, - 0x65, 0x7d, 0xc1, 0xef, 0x28, 0x4e, 0x2b, 0x62, 0xd4, 0xef, 0x1e, 0xcc, 0x99, 0xf1, 0xd6, 0x5a, - 0x1e, 0x72, 0x5c, 0x1a, 0x69, 0xfc, 0x39, 0x03, 0x57, 0xda, 0x0c, 0xfb, 0xbc, 0x43, 0x58, 0x1c, - 0x87, 0x2e, 0x94, 0x39, 0xf1, 0x1d, 0xc2, 0xac, 0xcb, 0x33, 0xdc, 0x44, 0x0a, 0x72, 0x90, 0x86, - 0x3c, 0xb8, 0xce, 0x88, 0x4d, 0x43, 0x4a, 0xfc, 0xe8, 0x82, 0xae, 0xf4, 0xbb, 0xe8, 0xba, 0x96, - 0xa0, 0x0e, 0xa9, 0x5b, 0x83, 0x3c, 0xe6, 0x5c, 0x5d, 0x23, 0x19, 0x59, 0x92, 0x0b, 0x72, 0xdd, - 0x70, 0xd0, 0x2a, 0xe4, 0xb0, 0x27, 0xb6, 0xc9, 0x93, 0x98, 0x35, 0xf5, 0x0a, 0xd5, 0x20, 0xa7, - 0xec, 0xae, 0xcc, 0x4b, 0x83, 0x6e, 0x4f, 0x2d, 0x8a, 0xa1, 0xc4, 0x9b, 0x5a, 0x12, 0x1d, 0xc0, - 0x62, 0x62, 0x4f, 0x25, 0xf7, 0xc6, 0x30, 0x7d, 0x61, 0xe3, 0x5f, 0x19, 0x28, 0x3e, 0x64, 0x0e, - 0x61, 0xfb, 0xd4, 0x75, 0xe3, 0x6c, 0x1d, 0xc3, 0x92, 0x87, 0x9f, 0x10, 0x66, 0x05, 0x82, 0x33, - 0xbd, 0x78, 0xc7, 0x04, 0x4e, 0xe2, 0xe9, 0xc6, 0x01, 0x12, 0x48, 0x52, 0xd0, 0x3e, 0xcc, 0x2b, - 0xc0, 0xf4, 0xdb, 0x00, 0x1e, 0xcc, 0x99, 0x4a, 0x1c, 0x7d, 0x06, 0x25, 0x97, 0x7e, 0xd1, 0xa3, - 0x0e, 0x8e, 0x68, 0xe0, 0x6b, 0x23, 0xd5, 0x75, 0xb7, 0x35, 0x35, 0x0a, 0x0f, 0xfa, 0x52, 0x12, - 0x52, 0xde, 0x76, 0x45, 0xf7, 0x02, 0x15, 0xdd, 0x80, 0xa5, 0x0e, 0x75, 0x5d, 0x4b, 0xa7, 0x2f, - 0x23, 0xd3, 0x07, 0x82, 0xb4, 0xa3, 0x52, 0x28, 0xbb, 0x87, 0x88, 0x4f, 0x87, 0x10, 0x99, 0x45, - 0x24, 0xba, 0xc7, 0x13, 0xc2, 0xf6, 0x09, 0x11, 0xcc, 0x28, 0x61, 0xe6, 0x14, 0x33, 0x8a, 0x99, - 0xef, 0x03, 0x8a, 0x82, 0x08, 0xbb, 0x96, 0x40, 0x23, 0x8e, 0x25, 0xa5, 0x2a, 0x0b, 0x52, 0x43, - 0x51, 0x72, 0xf6, 0x25, 0xe3, 0x50, 0xd0, 0x47, 0x76, 0x4b, 0x98, 0x4a, 0x7e, 0x64, 0x77, 0x5b, - 0xd0, 0x6b, 0x05, 0x58, 0x8a, 0xfa, 0x59, 0x33, 0xfe, 0x9f, 0x86, 0xab, 0x7b, 0xc4, 0x25, 0x67, - 0x84, 0xe1, 0xee, 0xc0, 0x3c, 0xf0, 0x73, 0x80, 0xd8, 0x63, 0xf2, 0x6e, 0x07, 0x30, 0x4e, 0x71, - 0x1f, 0x4e, 0x80, 0x07, 0x9d, 0x0e, 0x27, 0x51, 0x44, 0xfd, 0xee, 0x3b, 0x9d, 0xb8, 0x18, 0xbc, - 0x0f, 0x37, 0x32, 0x9a, 0x65, 0x46, 0x47, 0xb3, 0x0b, 0xa9, 0xcb, 0x8e, 0xa4, 0xae, 0x0c, 0xf3, - 0xb2, 0x97, 0xc8, 0xb4, 0x65, 0x4d, 0xb5, 0x40, 0xd7, 0x20, 0x47, 0xb9, 0x75, 0xd2, 0x3b, 0x97, - 0x09, 0xcb, 0x9b, 0xf3, 0x94, 0xd7, 0x7a, 0xe7, 0xa2, 0xab, 0x51, 0x6e, 0x75, 0xa8, 0x8f, 0x5d, - 0x4b, 0x18, 0xe1, 0x12, 0x4f, 0x1c, 0xb8, 0x05, 0xb9, 0xa7, 0x44, 0xf9, 0xbe, 0xe0, 0xb4, 0x12, - 0x86, 0xf1, 0xeb, 0x34, 0xa0, 0xd1, 0x1a, 0xfb, 0x76, 0x23, 0x7e, 0x13, 0x96, 0xc5, 0x10, 0x6c, - 0x89, 0x6e, 0x19, 0xdf, 0x72, 0x05, 0x13, 0x04, 0xad, 0x89, 0x29, 0x6b, 0x38, 0xb3, 0x84, 0xed, - 0xbb, 0x00, 0xaa, 0xd0, 0x38, 0x7d, 0x4e, 0x74, 0xd4, 0x16, 0x25, 0xa5, 0x45, 0x9f, 0x0f, 0x86, - 0x67, 0x7e, 0x30, 0x3c, 0xeb, 0x90, 0xe7, 0xbd, 0x93, 0x88, 0xda, 0x4f, 0xb8, 0x8c, 0x5b, 0xd6, - 0x4c, 0xd6, 0xc6, 0xff, 0xd2, 0x70, 0xbd, 0x6f, 0xf9, 0xf0, 0xb0, 0xf0, 0xf8, 0x32, 0xdb, 0xd7, - 0x85, 0xe6, 0xf5, 0x1c, 0x36, 0xd4, 0xd4, 0xe6, 0x58, 0x7d, 0xa7, 0xc3, 0x80, 0x53, 0x91, 0x10, - 0x5e, 0xc9, 0xc8, 0x09, 0xf8, 0xc7, 0x33, 0x6b, 0x6a, 0xc6, 0x18, 0x4d, 0x0d, 0x61, 0xae, 0x69, - 0xf8, 0x11, 0x0e, 0x47, 0x3e, 0x5c, 0x8f, 0x75, 0xab, 0xa6, 0xd0, 0xd7, 0x9b, 0x95, 0x7a, 0x7f, - 0x34, 0xb3, 0xde, 0x1d, 0x21, 0x9f, 0xe8, 0xbc, 0xa6, 0x61, 0x87, 0xa8, 0xfc, 0x7e, 0x36, 0x9f, - 0x2e, 0x66, 0x8c, 0x3f, 0x02, 0x94, 0x5b, 0x11, 0x8e, 0x48, 0xa7, 0xe7, 0xca, 0x8a, 0x8b, 0xc3, - 0xec, 0xc1, 0x92, 0xbc, 0x09, 0xac, 0xd0, 0xc5, 0x76, 0x3c, 0x82, 0xdc, 0x9f, 0xde, 0x26, 0xc6, - 0xe0, 0x0c, 0x13, 0x9b, 0x02, 0xcb, 0x8b, 0x27, 0x45, 0x08, 0x12, 0x1a, 0x0a, 0xa0, 0xa0, 0xd4, - 0xe9, 0xa7, 0x9c, 0xbe, 0x91, 0x0f, 0xde, 0x51, 0xa1, 0xa9, 0xd0, 0xd4, 0x60, 0x1a, 0x0c, 0x50, - 0xd0, 0x6f, 0x53, 0xb0, 0x61, 0x07, 0xbe, 0x23, 0xa3, 0x81, 0x5d, 0x6b, 0xc0, 0x59, 0x79, 0x4c, - 0x55, 0x7b, 0x3d, 0x7c, 0x73, 0xfd, 0xbb, 0x7d, 0xd0, 0x31, 0x3e, 0xaf, 0xd9, 0x93, 0xd8, 0x13, - 0x2c, 0x8a, 0x18, 0xed, 0x76, 0x09, 0x23, 0x8e, 0xee, 0xd4, 0x97, 0x60, 0x51, 0x3b, 0x86, 0x1c, - 0x6f, 0x51, 0xc2, 0x46, 0xbf, 0x4a, 0xc1, 0x9a, 0x1b, 0xf8, 0x5d, 0x2b, 0x22, 0xcc, 0x1b, 0x89, - 0xd0, 0xc2, 0xdb, 0x96, 0xc4, 0x83, 0xc0, 0xef, 0xb6, 0x09, 0xf3, 0xc6, 0x84, 0x67, 0xd5, 0x1d, - 0xcb, 0x5b, 0xff, 0x1c, 0x2a, 0x93, 0x0a, 0x09, 0xed, 0xc5, 0x83, 0xc1, 0x5b, 0x4d, 0x1a, 0x7a, - 0x2c, 0x58, 0xff, 0x32, 0x05, 0xab, 0xe3, 0x4b, 0x07, 0x3d, 0x86, 0xa2, 0xac, 0x4a, 0xe2, 0xe8, - 0x18, 0x24, 0x97, 0xce, 0x9d, 0x37, 0xd3, 0xd5, 0x70, 0xcc, 0x15, 0x8d, 0xa4, 0xd7, 0xe8, 0x23, - 0xc8, 0xa9, 0x8f, 0x16, 0xfa, 0x4d, 0x3c, 0x61, 0x04, 0x51, 0xdf, 0x39, 0xaa, 0x83, 0x86, 0x99, - 0x52, 0xcc, 0xd4, 0xe2, 0xeb, 0x36, 0x6c, 0x4c, 0xa9, 0xbc, 0x4b, 0x0a, 0xd2, 0x2f, 0x47, 0x95, - 0x0c, 0x14, 0x13, 0xfa, 0x0c, 0x50, 0x52, 0xae, 0xef, 0x1e, 0xaa, 0x62, 0x82, 0xa5, 0x29, 0xa2, - 0x0a, 0x26, 0xd5, 0xce, 0xe5, 0x38, 0x98, 0x3c, 0x57, 0xd5, 0xed, 0x78, 0x3f, 0x9b, 0xcf, 0x14, - 0xb3, 0xc6, 0x9f, 0x52, 0x80, 0xe4, 0xe5, 0x39, 0xfc, 0x28, 0x5c, 0x81, 0x74, 0xf2, 0xfc, 0x4f, - 0x53, 0x39, 0xb2, 0xf3, 0x73, 0xef, 0x24, 0x70, 0xd5, 0xc3, 0xc7, 0xd4, 0x2b, 0xd1, 0x1e, 0x4f, - 0x31, 0xb7, 0xd4, 0xb3, 0x58, 0xf6, 0xcf, 0xbc, 0xb9, 0x78, 0x8a, 0xb9, 0x7a, 0xb1, 0x0d, 0x7f, - 0x4c, 0xc8, 0x5e, 0xf8, 0x98, 0xf0, 0x1e, 0x94, 0x70, 0x14, 0x78, 0xd4, 0xb6, 0x18, 0xe1, 0x81, - 0xdb, 0x13, 0x81, 0x97, 0x57, 0x53, 0xc9, 0x2c, 0x2a, 0x86, 0x99, 0xd0, 0x8d, 0x2f, 0x33, 0xf0, - 0x9d, 0xa4, 0xb1, 0x8c, 0x7b, 0xc6, 0x5e, 0xb4, 0xf8, 0xf5, 0xdd, 0x7f, 0x15, 0x72, 0xa2, 0x23, - 0x13, 0x26, 0xed, 0x5e, 0x34, 0xf5, 0x6a, 0xba, 0xd1, 0x07, 0x90, 0xe3, 0x11, 0x8e, 0x7a, 0x5c, - 0x5a, 0xba, 0x32, 0x4b, 0xea, 0x77, 0xb5, 0xca, 0x96, 0x94, 0x33, 0xb5, 0x3c, 0xfa, 0x09, 0x6c, - 0x7c, 0xd1, 0xc3, 0x7e, 0xd4, 0xf3, 0x2c, 0x3b, 0xf0, 0xcf, 0x08, 0xe3, 0x62, 0x64, 0x4f, 0x9e, - 0xd1, 0x39, 0x19, 0x88, 0x35, 0xbd, 0x65, 0x37, 0xd9, 0x11, 0x7f, 0x28, 0x18, 0x1f, 0xbe, 0x85, - 0xf1, 0xe1, 0x43, 0xb7, 0xa1, 0x14, 0x0f, 0x20, 0xa2, 0xfb, 0x5b, 0xe2, 0x97, 0x1c, 0x97, 0x0b, - 0xe6, 0x95, 0x98, 0xd1, 0x24, 0xac, 0x4d, 0xed, 0x27, 0x62, 0xb6, 0xe6, 0x11, 0x09, 0x2d, 0xf1, - 0xc4, 0xb6, 0xb4, 0x7e, 0x5e, 0x59, 0x54, 0xb3, 0xb5, 0xe0, 0x88, 0x87, 0xf8, 0xcf, 0x34, 0x1d, - 0x7d, 0x1f, 0x56, 0xd4, 0xcc, 0x45, 0xa3, 0x73, 0x2b, 0xa2, 0x84, 0x55, 0x40, 0xc2, 0x16, 0x12, - 0x6a, 0x9b, 0x12, 0x66, 0xbc, 0x48, 0xc1, 0xfa, 0x83, 0x41, 0xca, 0x71, 0xc8, 0x09, 0x8b, 0x26, - 0x65, 0x0f, 0x41, 0xd6, 0xc7, 0x1e, 0xd1, 0xd5, 0x26, 0x7f, 0x0b, 0xbb, 0xa8, 0x4f, 0x23, 0x8a, - 0x5d, 0x51, 0x6f, 0x5d, 0xea, 0xcb, 0xcf, 0x1d, 0x6a, 0x66, 0x2b, 0x6a, 0xce, 0xa1, 0x64, 0x34, - 0x43, 0x0f, 0x7d, 0x08, 0x15, 0x0f, 0x53, 0x3f, 0x22, 0x3e, 0xf6, 0x6d, 0x62, 0x75, 0x18, 0xb6, - 0xe5, 0x9b, 0x48, 0xc8, 0xa8, 0xa4, 0xae, 0x0e, 0xf0, 0xf7, 0x35, 0x5b, 0x48, 0xde, 0x83, 0x55, - 0xe9, 0x7a, 0x3c, 0xa3, 0x58, 0x7e, 0xa0, 0xee, 0x04, 0x3d, 0x19, 0x97, 0x05, 0x37, 0x9e, 0x35, - 0x8e, 0x34, 0xcf, 0xf8, 0x43, 0x1a, 0xae, 0xa9, 0x61, 0x2e, 0xce, 0x77, 0xec, 0xdb, 0xc5, 0x4a, - 0x4c, 0x8d, 0x54, 0x62, 0xbf, 0xa8, 0xd2, 0xdf, 0x6e, 0x51, 0x65, 0x5e, 0x57, 0x54, 0x63, 0xeb, - 0x24, 0xfb, 0x26, 0x75, 0x32, 0x3f, 0xbe, 0x4e, 0x8c, 0xbf, 0xa6, 0x60, 0x55, 0xc5, 0x27, 0x39, - 0xc6, 0x53, 0x2e, 0x1b, 0x7d, 0x30, 0xd3, 0x93, 0x0f, 0x66, 0x66, 0x96, 0xdb, 0x24, 0x3b, 0xe1, - 0x38, 0x8c, 0x16, 0xed, 0xfc, 0xb8, 0xa2, 0x65, 0x50, 0x6e, 0x33, 0xec, 0x50, 0xbf, 0x6b, 0x92, - 0xa7, 0x98, 0x39, 0xfd, 0x31, 0xfd, 0x4a, 0xa4, 0xe8, 0x16, 0x93, 0x8c, 0xf8, 0x03, 0xf2, 0xf6, - 0xd4, 0x81, 0x41, 0x7f, 0x21, 0x1a, 0x82, 0x34, 0x57, 0xa2, 0xc1, 0x25, 0x37, 0x7e, 0x93, 0x82, - 0xf2, 0xb8, 0x8d, 0xe2, 0x7d, 0x16, 0x3c, 0xf5, 0x49, 0xfc, 0x11, 0x50, 0x2d, 0xd0, 0xe7, 0x90, - 0x73, 0x88, 0x1f, 0x78, 0xaa, 0x74, 0x2e, 0xf3, 0xf3, 0xb9, 0xc6, 0xad, 0x99, 0x5f, 0xbd, 0xdc, - 0x4c, 0x7d, 0xfd, 0x72, 0x33, 0xf5, 0xdf, 0x97, 0x9b, 0xa9, 0xdf, 0xbd, 0xda, 0x9c, 0xfb, 0xfa, - 0xd5, 0xe6, 0xdc, 0xbf, 0x5f, 0x6d, 0xce, 0x3d, 0xfe, 0x70, 0x76, 0x1d, 0xc3, 0xff, 0x4b, 0x39, - 0xc9, 0x49, 0xc6, 0x0f, 0xbe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x34, 0xe9, 0x9c, 0xdb, 0x71, 0x19, - 0x00, 0x00, + 0x15, 0x17, 0x3f, 0x44, 0x49, 0x8f, 0xa2, 0x4c, 0x8e, 0x25, 0x99, 0x92, 0x12, 0xd9, 0x59, 0x20, + 0x80, 0x71, 0x1f, 0x94, 0xe5, 0x38, 0xc1, 0x21, 0x45, 0x10, 0x51, 0xa2, 0x4e, 0x34, 0x2c, 0x99, + 0x59, 0x52, 0xbe, 0x3b, 0x27, 0xb8, 0xcd, 0x68, 0x77, 0x48, 0x0d, 0xb4, 0x5f, 0xb7, 0x33, 0x94, + 0x2d, 0x03, 0xa9, 0x93, 0x2e, 0x01, 0x52, 0xa5, 0x48, 0x91, 0x22, 0x4d, 0x80, 0x14, 0x01, 0xd2, + 0x5e, 0x95, 0xe6, 0xba, 0x1c, 0xd2, 0x24, 0x48, 0x61, 0x04, 0x76, 0x91, 0x36, 0x7f, 0x42, 0x30, + 0x1f, 0xbb, 0x24, 0xc5, 0x0f, 0xd3, 0x96, 0xae, 0x12, 0xe7, 0xbd, 0x79, 0xbf, 0xf7, 0x39, 0xf3, + 0xde, 0xac, 0xe0, 0xae, 0x73, 0xe1, 0x3c, 0x0f, 0xa3, 0x80, 0x07, 0x76, 0xe0, 0x6e, 0x51, 0xdf, + 0x21, 0xcf, 0x49, 0xb4, 0x45, 0xce, 0x89, 0xcf, 0x99, 0xfe, 0x53, 0x91, 0x6c, 0xb4, 0xd1, 0xbf, + 0xb3, 0xa2, 0x77, 0x56, 0xd4, 0x96, 0xf5, 0x35, 0x3b, 0x60, 0x5e, 0xc0, 0x2c, 0xc9, 0xdf, 0x52, + 0x0b, 0x25, 0xb7, 0xbe, 0xdc, 0x09, 0x3a, 0x81, 0xa2, 0x8b, 0x5f, 0x9a, 0x7a, 0x6f, 0xa4, 0x5e, + 0x76, 0x8a, 0x23, 0xe2, 0x6c, 0x45, 0xc4, 0x0b, 0xce, 0xb1, 0x6b, 0x45, 0x04, 0xb3, 0xc0, 0xd7, + 0x12, 0xef, 0x8f, 0x94, 0x48, 0x08, 0xe7, 0xdb, 0x5b, 0xb6, 0x1b, 0x9c, 0xe8, 0xcd, 0xdb, 0x6f, + 0xdc, 0xcc, 0xba, 0x27, 0xd8, 0xb6, 0x83, 0xae, 0xcf, 0x95, 0x88, 0xf1, 0xf7, 0x14, 0xdc, 0xd8, + 0xef, 0xfa, 0x0e, 0xf5, 0x3b, 0xc7, 0xa1, 0x83, 0x39, 0x79, 0xb2, 0x8d, 0xbe, 0x03, 0x8b, 0x21, + 0x89, 0x42, 0xc2, 0xbb, 0xd8, 0xb5, 0xa8, 0x53, 0x4e, 0xdd, 0x49, 0xdd, 0x2d, 0x98, 0xf9, 0x84, + 0x56, 0x77, 0xd0, 0x7b, 0x50, 0x6a, 0x2b, 0x29, 0xeb, 0x1c, 0xbb, 0x5d, 0x62, 0x85, 0xa1, 0x57, + 0x4e, 0xdf, 0x49, 0xdd, 0x9d, 0x35, 0x6f, 0x68, 0xc6, 0x13, 0x41, 0x6f, 0x84, 0x1e, 0xf2, 0xa0, + 0x10, 0xef, 0x95, 0x26, 0x95, 0x33, 0x77, 0x52, 0x77, 0x17, 0xab, 0x07, 0x5f, 0xbd, 0xbc, 0x3d, + 0xf3, 0xef, 0x97, 0xb7, 0x7f, 0xdc, 0xa1, 0xfc, 0xb4, 0x7b, 0x52, 0xb1, 0x03, 0x6f, 0x6b, 0xc0, + 0xfe, 0xf3, 0x07, 0x1f, 0xda, 0xa7, 0x98, 0xfa, 0x3d, 0x07, 0x1c, 0x7e, 0x11, 0x12, 0x56, 0x69, + 0x92, 0x88, 0x62, 0x97, 0xbe, 0xc0, 0x27, 0x2e, 0xa9, 0xfb, 0xdc, 0x5c, 0xd4, 0xf0, 0x75, 0x81, + 0x6e, 0xfc, 0x36, 0x0d, 0x4b, 0xda, 0xa3, 0x9a, 0x48, 0xd3, 0x93, 0x6d, 0xf4, 0x08, 0xe6, 0xba, + 0xd2, 0x39, 0x56, 0x4e, 0xdd, 0xc9, 0xdc, 0xcd, 0xdf, 0xff, 0xa0, 0x32, 0x21, 0xad, 0x95, 0x4b, + 0xf1, 0xa8, 0x66, 0x85, 0xa5, 0x66, 0x0c, 0x81, 0xf6, 0x20, 0x2b, 0xec, 0x90, 0xee, 0x2e, 0xdd, + 0xbf, 0x37, 0x0d, 0x94, 0x36, 0xa4, 0xd2, 0xba, 0x08, 0x89, 0x29, 0xa5, 0x0d, 0x0f, 0xb2, 0x62, + 0x85, 0x96, 0xa1, 0xd8, 0xfa, 0xac, 0x51, 0xb3, 0x8e, 0x8f, 0x9a, 0x8d, 0xda, 0x6e, 0x7d, 0xbf, + 0x5e, 0xdb, 0x2b, 0xce, 0xa0, 0x5b, 0x70, 0x53, 0x52, 0x1b, 0x66, 0xed, 0xb0, 0x7e, 0x7c, 0x68, + 0x35, 0x77, 0x0e, 0x1b, 0x8f, 0x6a, 0xc5, 0x14, 0xba, 0x0d, 0x1b, 0x92, 0xb1, 0x7f, 0x7c, 0xb4, + 0x57, 0x3f, 0xfa, 0xd8, 0x32, 0x77, 0x5a, 0x35, 0x6b, 0xe7, 0x68, 0xcf, 0xaa, 0x1f, 0xed, 0xd5, + 0x3e, 0x2d, 0xa6, 0xd1, 0x0a, 0x94, 0x06, 0x24, 0x9f, 0x3c, 0x6e, 0xd5, 0x8a, 0x19, 0xe3, 0x6f, + 0x69, 0x28, 0x1c, 0xe2, 0xe8, 0x8c, 0xf0, 0x38, 0x28, 0x1b, 0xb0, 0xe0, 0x49, 0x42, 0x2f, 0xc5, + 0xf3, 0x8a, 0x50, 0x77, 0xd0, 0x53, 0x58, 0x0c, 0x23, 0x6a, 0x13, 0x4b, 0x39, 0x2d, 0x7d, 0xcd, + 0xdf, 0xff, 0xfe, 0x44, 0x5f, 0x15, 0x7c, 0x43, 0x88, 0xa9, 0xd0, 0x69, 0x4d, 0x07, 0x33, 0x66, + 0x3e, 0xec, 0x51, 0xd1, 0x27, 0x50, 0xd0, 0x8a, 0xed, 0x88, 0x08, 0xf0, 0x8c, 0x04, 0xbf, 0x37, + 0x05, 0xf8, 0xae, 0x14, 0xe8, 0xe1, 0x2e, 0x7a, 0x7d, 0xe4, 0x3e, 0x60, 0x2f, 0x70, 0x68, 0xfb, + 0xa2, 0x9c, 0x9d, 0x1a, 0xf8, 0x50, 0x0a, 0x0c, 0x01, 0x2b, 0x72, 0x75, 0x0e, 0x66, 0xe5, 0x6e, + 0xe3, 0x21, 0x94, 0xc7, 0x79, 0x89, 0x2a, 0x70, 0x53, 0x85, 0xec, 0x19, 0xe5, 0xa7, 0x16, 0x79, + 0x1e, 0x06, 0x3e, 0xf1, 0xb9, 0x8c, 0x6c, 0xd6, 0x2c, 0x49, 0xd6, 0x27, 0x94, 0x9f, 0xd6, 0x34, + 0xc3, 0xf8, 0x14, 0x4a, 0x0a, 0xab, 0x8a, 0x59, 0x02, 0x82, 0x20, 0x1b, 0x62, 0x1a, 0x49, 0xa9, + 0x05, 0x53, 0xfe, 0x46, 0x5b, 0xb0, 0xec, 0x51, 0xdf, 0x52, 0xe0, 0xf6, 0x29, 0xf6, 0x3b, 0xbd, + 0xe3, 0x56, 0x30, 0x4b, 0x1e, 0xf5, 0xa5, 0x35, 0xbb, 0x92, 0xd3, 0x08, 0x3d, 0xa3, 0x0b, 0x37, + 0x47, 0x84, 0x0b, 0x55, 0x21, 0x7b, 0x82, 0x19, 0x91, 0xd8, 0xf9, 0xfb, 0x95, 0x29, 0xa2, 0xd2, + 0x67, 0x99, 0x29, 0x65, 0xd1, 0x3a, 0xcc, 0x27, 0x9e, 0x09, 0xfd, 0x25, 0x33, 0x59, 0x1b, 0x9f, + 0xc5, 0x6a, 0x07, 0x82, 0x79, 0x1d, 0x6a, 0x8d, 0x3f, 0xa7, 0xa0, 0xd0, 0x0c, 0xba, 0x91, 0x4d, + 0x1e, 0xb7, 0xc5, 0x91, 0x62, 0xe8, 0x67, 0x50, 0xe8, 0xdd, 0x65, 0x71, 0x05, 0x8f, 0xad, 0xd0, + 0x84, 0x70, 0xbe, 0x5d, 0xa9, 0x2b, 0x5a, 0x33, 0x91, 0xae, 0x3b, 0x22, 0xe1, 0xac, 0x6f, 0x8d, + 0x1e, 0xc0, 0x1c, 0x76, 0x9c, 0x88, 0x30, 0x26, 0xbd, 0x5c, 0xa8, 0x96, 0xff, 0xf1, 0xd7, 0x0f, + 0x97, 0xf5, 0x05, 0xbf, 0xa3, 0x38, 0x4d, 0x1e, 0x51, 0xbf, 0x73, 0x30, 0x63, 0xc6, 0x5b, 0xab, + 0xf3, 0x90, 0x63, 0xd2, 0x48, 0xe3, 0x4f, 0x19, 0xb8, 0xd1, 0x8a, 0xb0, 0xcf, 0xda, 0x24, 0x8a, + 0xe3, 0xd0, 0x81, 0x65, 0x46, 0x7c, 0x87, 0x44, 0xd6, 0xf5, 0x19, 0x6e, 0x22, 0x05, 0xd9, 0x4f, + 0x43, 0x1e, 0xdc, 0x8a, 0x88, 0x4d, 0x43, 0x4a, 0x7c, 0x7e, 0x49, 0x57, 0xfa, 0x2a, 0xba, 0x56, + 0x12, 0xd4, 0x01, 0x75, 0x6b, 0x30, 0x8f, 0x19, 0x53, 0xd7, 0x48, 0x46, 0x96, 0xe4, 0x9c, 0x5c, + 0xd7, 0x1d, 0xb4, 0x0a, 0x39, 0xec, 0x89, 0x6d, 0xf2, 0x24, 0x66, 0x4d, 0xbd, 0x42, 0x55, 0xc8, + 0x29, 0xbb, 0xcb, 0xb3, 0xd2, 0xa0, 0xf7, 0x26, 0x16, 0xc5, 0x40, 0xe2, 0x4d, 0x2d, 0x89, 0x0e, + 0x60, 0x21, 0xb1, 0xa7, 0x9c, 0x7b, 0x6b, 0x98, 0x9e, 0xb0, 0xf1, 0xcf, 0x0c, 0x14, 0x1f, 0x47, + 0x0e, 0x89, 0xf6, 0xa9, 0xeb, 0xc6, 0xd9, 0x3a, 0x86, 0xbc, 0x87, 0xcf, 0x48, 0x64, 0x05, 0x82, + 0x33, 0xb9, 0x78, 0x47, 0x04, 0x4e, 0xe2, 0xe9, 0xc6, 0x01, 0x12, 0x48, 0x52, 0xd0, 0x3e, 0xcc, + 0x2a, 0xc0, 0xf4, 0xbb, 0x00, 0x1e, 0xcc, 0x98, 0x4a, 0x1c, 0x7d, 0x0e, 0x25, 0x97, 0x7e, 0xd1, + 0xa5, 0x0e, 0xe6, 0x34, 0xf0, 0xb5, 0x91, 0xea, 0xba, 0xdb, 0x9a, 0x18, 0x85, 0x47, 0x3d, 0x29, + 0x09, 0x29, 0x6f, 0xbb, 0xa2, 0x7b, 0x89, 0x8a, 0x6e, 0x43, 0xbe, 0x4d, 0x5d, 0xd7, 0xd2, 0xe9, + 0xcb, 0xc8, 0xf4, 0x81, 0x20, 0xed, 0xa8, 0x14, 0xca, 0xee, 0x21, 0xe2, 0xd3, 0x26, 0x44, 0x66, + 0x11, 0x89, 0xee, 0x71, 0x46, 0xa2, 0x7d, 0x42, 0x04, 0x93, 0x27, 0xcc, 0x9c, 0x62, 0xf2, 0x98, + 0xf9, 0x01, 0x20, 0x1e, 0x70, 0xec, 0x5a, 0x02, 0x8d, 0x38, 0x96, 0x94, 0x2a, 0xcf, 0x49, 0x0d, + 0x45, 0xc9, 0xd9, 0x97, 0x8c, 0x43, 0x41, 0x1f, 0xda, 0x2d, 0x61, 0xca, 0xf3, 0x43, 0xbb, 0x5b, + 0x82, 0x5e, 0x2d, 0x40, 0x9e, 0xf7, 0xb2, 0x66, 0xfc, 0x2f, 0x0d, 0x37, 0xf7, 0x88, 0x4b, 0xce, + 0x49, 0x84, 0x3b, 0x7d, 0xf3, 0xc0, 0x4f, 0x01, 0x62, 0x8f, 0xc9, 0xd5, 0x0e, 0x60, 0x9c, 0xe2, + 0x1e, 0x9c, 0x00, 0x0f, 0xda, 0x6d, 0x46, 0x38, 0xa7, 0x7e, 0xe7, 0x4a, 0x27, 0x2e, 0x06, 0xef, + 0xc1, 0x0d, 0x8d, 0x66, 0x99, 0xe1, 0xd1, 0xec, 0x52, 0xea, 0xb2, 0x43, 0xa9, 0x5b, 0x86, 0x59, + 0xd9, 0x4b, 0x64, 0xda, 0xb2, 0xa6, 0x5a, 0xa0, 0x15, 0xc8, 0x51, 0x66, 0x9d, 0x74, 0x2f, 0x64, + 0xc2, 0xe6, 0xcd, 0x59, 0xca, 0xaa, 0xdd, 0x0b, 0xd1, 0xd5, 0x28, 0xb3, 0xda, 0xd4, 0xc7, 0xae, + 0x25, 0x8c, 0x70, 0x89, 0x27, 0x0e, 0xdc, 0x9c, 0xdc, 0x53, 0xa2, 0x6c, 0x5f, 0x70, 0x9a, 0x09, + 0xc3, 0xf8, 0x55, 0x1a, 0xd0, 0x70, 0x8d, 0x7d, 0xb3, 0x11, 0xbf, 0x03, 0x8b, 0x62, 0x08, 0xb6, + 0x44, 0xb7, 0x8c, 0x6f, 0xb9, 0x82, 0x09, 0x82, 0xd6, 0xc0, 0x34, 0xaa, 0x3b, 0xd3, 0x84, 0xed, + 0xdb, 0x00, 0xaa, 0xd0, 0x18, 0x7d, 0x41, 0x74, 0xd4, 0x16, 0x24, 0xa5, 0x49, 0x5f, 0xf4, 0x87, + 0x67, 0xb6, 0x3f, 0x3c, 0xeb, 0x30, 0xcf, 0xba, 0x27, 0x9c, 0xda, 0x67, 0x4c, 0xc6, 0x2d, 0x6b, + 0x26, 0x6b, 0xe3, 0xbf, 0x69, 0xb8, 0xd5, 0xb3, 0x7c, 0x70, 0x58, 0x78, 0x7a, 0x9d, 0xed, 0xeb, + 0x52, 0xf3, 0x7a, 0x01, 0x1b, 0x6a, 0x6a, 0x73, 0xac, 0x9e, 0xd3, 0x61, 0xc0, 0xa8, 0x48, 0x08, + 0x2b, 0x67, 0xe4, 0x04, 0xfc, 0xc3, 0xa9, 0x35, 0x35, 0x62, 0x8c, 0x86, 0x86, 0x30, 0xd7, 0x34, + 0xfc, 0x10, 0x87, 0x21, 0x1f, 0x6e, 0xc5, 0xba, 0x55, 0x53, 0xe8, 0xe9, 0xcd, 0x4a, 0xbd, 0x3f, + 0x98, 0x5a, 0xef, 0x8e, 0x90, 0x4f, 0x74, 0xae, 0x68, 0xd8, 0x01, 0x2a, 0x7b, 0x98, 0x9d, 0x4f, + 0x17, 0x33, 0xc6, 0x1f, 0x00, 0x96, 0x9b, 0x1c, 0x73, 0xd2, 0xee, 0xba, 0xb2, 0xe2, 0xe2, 0x30, + 0x7b, 0x90, 0x97, 0x37, 0x81, 0x15, 0xba, 0xd8, 0x8e, 0x47, 0x90, 0x87, 0x93, 0xdb, 0xc4, 0x08, + 0x9c, 0x41, 0x62, 0x43, 0x60, 0x79, 0xf1, 0xa4, 0x08, 0x41, 0x42, 0x43, 0x01, 0x14, 0x94, 0x3a, + 0xfd, 0x94, 0xd3, 0x37, 0xf2, 0xc1, 0x15, 0x15, 0x9a, 0x0a, 0x4d, 0x0d, 0xa6, 0x41, 0x1f, 0x05, + 0xfd, 0x3a, 0x05, 0x1b, 0x76, 0xe0, 0x3b, 0x32, 0x1a, 0xd8, 0xb5, 0xfa, 0x9c, 0x95, 0xc7, 0x54, + 0xb5, 0xd7, 0xc3, 0xb7, 0xd7, 0xbf, 0xdb, 0x03, 0x1d, 0xe1, 0xf3, 0x9a, 0x3d, 0x8e, 0x3d, 0xc6, + 0x22, 0x1e, 0xd1, 0x4e, 0x87, 0x44, 0xc4, 0xd1, 0x9d, 0xfa, 0x1a, 0x2c, 0x6a, 0xc5, 0x90, 0xa3, + 0x2d, 0x4a, 0xd8, 0xe8, 0x97, 0x29, 0x58, 0x73, 0x03, 0xbf, 0x63, 0x71, 0x12, 0x79, 0x43, 0x11, + 0x9a, 0x7b, 0xd7, 0x92, 0x78, 0x14, 0xf8, 0x9d, 0x16, 0x89, 0xbc, 0x11, 0xe1, 0x59, 0x75, 0x47, + 0xf2, 0xd6, 0x7f, 0x0e, 0xe5, 0x71, 0x85, 0x84, 0xf6, 0xe2, 0xc1, 0xe0, 0x9d, 0x26, 0x0d, 0x3d, + 0x16, 0xac, 0x7f, 0x99, 0x82, 0xd5, 0xd1, 0xa5, 0x83, 0x9e, 0x42, 0x51, 0x56, 0x25, 0x71, 0x74, + 0x0c, 0x92, 0x4b, 0xe7, 0xde, 0xdb, 0xe9, 0xaa, 0x3b, 0xe6, 0x92, 0x46, 0xd2, 0x6b, 0xf4, 0x31, + 0xe4, 0xd4, 0x47, 0x0b, 0xfd, 0x26, 0x1e, 0x33, 0x82, 0xa8, 0xef, 0x1c, 0x95, 0x7e, 0xc3, 0x4c, + 0x29, 0x66, 0x6a, 0xf1, 0x75, 0x1b, 0x36, 0x26, 0x54, 0xde, 0x35, 0x05, 0xe9, 0x17, 0xc3, 0x4a, + 0xfa, 0x8a, 0x09, 0x7d, 0x0e, 0x28, 0x29, 0xd7, 0xab, 0x87, 0xaa, 0x98, 0x60, 0x69, 0x8a, 0xa8, + 0x82, 0x71, 0xb5, 0x73, 0x3d, 0x0e, 0x26, 0xcf, 0x55, 0x75, 0x3b, 0x3e, 0xcc, 0xce, 0x67, 0x8a, + 0x59, 0xe3, 0x8f, 0x29, 0x40, 0xf2, 0xf2, 0x1c, 0x7c, 0x14, 0x2e, 0x41, 0x3a, 0x79, 0xfe, 0xa7, + 0xa9, 0x1c, 0xd9, 0xd9, 0x85, 0x77, 0x12, 0xb8, 0xea, 0xe1, 0x63, 0xea, 0x95, 0x68, 0x8f, 0xa7, + 0x98, 0x59, 0xea, 0x59, 0x2c, 0xfb, 0xe7, 0xbc, 0xb9, 0x70, 0x8a, 0x99, 0x7a, 0xb1, 0x0d, 0x7e, + 0x4c, 0xc8, 0x5e, 0xfa, 0x98, 0xf0, 0x3e, 0x94, 0x30, 0x0f, 0x3c, 0x6a, 0x5b, 0x11, 0x61, 0x81, + 0xdb, 0x15, 0x81, 0x97, 0x57, 0x53, 0xc9, 0x2c, 0x2a, 0x86, 0x99, 0xd0, 0x8d, 0x2f, 0x33, 0xf0, + 0xad, 0xa4, 0xb1, 0x8c, 0x7a, 0xc6, 0x5e, 0xb6, 0xf8, 0xcd, 0xdd, 0x7f, 0x15, 0x72, 0xa2, 0x23, + 0x93, 0x48, 0xda, 0xbd, 0x60, 0xea, 0xd5, 0x64, 0xa3, 0x0f, 0x20, 0xc7, 0x38, 0xe6, 0x5d, 0x26, + 0x2d, 0x5d, 0x9a, 0x26, 0xf5, 0xbb, 0x5a, 0x65, 0x53, 0xca, 0x99, 0x5a, 0x1e, 0xfd, 0x08, 0x36, + 0xbe, 0xe8, 0x62, 0x9f, 0x77, 0x3d, 0xcb, 0x0e, 0xfc, 0x73, 0x12, 0x31, 0x31, 0xb2, 0x27, 0xcf, + 0xe8, 0x9c, 0x0c, 0xc4, 0x9a, 0xde, 0xb2, 0x9b, 0xec, 0x88, 0x3f, 0x14, 0x8c, 0x0e, 0xdf, 0xdc, + 0xe8, 0xf0, 0xa1, 0xf7, 0xa0, 0x14, 0x0f, 0x20, 0xa2, 0xfb, 0x5b, 0xe2, 0x97, 0x1c, 0x97, 0x0b, + 0xe6, 0x8d, 0x98, 0xd1, 0x20, 0x51, 0x8b, 0xda, 0x67, 0x62, 0xb6, 0x66, 0x9c, 0x84, 0x96, 0x78, + 0x62, 0x5b, 0x5a, 0x3f, 0x2b, 0x2f, 0xa8, 0xd9, 0x5a, 0x70, 0xc4, 0x43, 0xfc, 0x27, 0x9a, 0x8e, + 0xbe, 0x0b, 0x4b, 0x6a, 0xe6, 0xa2, 0xfc, 0xc2, 0xe2, 0x94, 0x44, 0x65, 0x90, 0xb0, 0x85, 0x84, + 0xda, 0xa2, 0x24, 0x32, 0x5e, 0xa6, 0x60, 0xfd, 0x51, 0x3f, 0xe5, 0x38, 0x64, 0x24, 0xe2, 0xe3, + 0xb2, 0x87, 0x20, 0xeb, 0x63, 0x8f, 0xe8, 0x6a, 0x93, 0xbf, 0x85, 0x5d, 0xd4, 0xa7, 0x9c, 0x62, + 0x57, 0xd4, 0x5b, 0x87, 0xfa, 0xf2, 0x73, 0x87, 0x9a, 0xd9, 0x8a, 0x9a, 0x73, 0x28, 0x19, 0x8d, + 0xd0, 0x43, 0x1f, 0x41, 0xd9, 0xc3, 0xd4, 0xe7, 0xc4, 0xc7, 0xbe, 0x4d, 0xac, 0x76, 0x84, 0x6d, + 0xf9, 0x26, 0x12, 0x32, 0x2a, 0xa9, 0xab, 0x7d, 0xfc, 0x7d, 0xcd, 0x16, 0x92, 0x0f, 0x60, 0x55, + 0xba, 0x1e, 0xcf, 0x28, 0x96, 0x1f, 0xa8, 0x3b, 0x41, 0x4f, 0xc6, 0xcb, 0x82, 0x1b, 0xcf, 0x1a, + 0x47, 0x9a, 0x67, 0xfc, 0x3e, 0x0d, 0x2b, 0x6a, 0x98, 0x8b, 0xf3, 0x1d, 0xfb, 0x76, 0xb9, 0x12, + 0x53, 0x43, 0x95, 0xd8, 0x2b, 0xaa, 0xf4, 0x37, 0x5b, 0x54, 0x99, 0x37, 0x15, 0xd5, 0xc8, 0x3a, + 0xc9, 0xbe, 0x4d, 0x9d, 0xcc, 0x8e, 0xae, 0x13, 0xe3, 0x2f, 0x29, 0x58, 0x55, 0xf1, 0x49, 0x8e, + 0xf1, 0x84, 0xcb, 0x46, 0x1f, 0xcc, 0xf4, 0xf8, 0x83, 0x99, 0x99, 0xe6, 0x36, 0xc9, 0x8e, 0x39, + 0x0e, 0xc3, 0x45, 0x3b, 0x3b, 0xaa, 0x68, 0x19, 0xac, 0xb4, 0x22, 0xec, 0x50, 0xbf, 0x63, 0x92, + 0x67, 0x38, 0x72, 0x58, 0x6f, 0x4e, 0xbf, 0xc1, 0x15, 0xc3, 0x8a, 0x14, 0x47, 0x7f, 0x41, 0xde, + 0x9e, 0x38, 0x31, 0xe8, 0x4f, 0x44, 0x03, 0x98, 0xe6, 0x12, 0x1f, 0x50, 0x61, 0xfc, 0x2e, 0x05, + 0xcb, 0xa3, 0x36, 0x8a, 0x07, 0x5a, 0xf0, 0xcc, 0x27, 0xf1, 0x57, 0x40, 0xb5, 0x40, 0x67, 0xb0, + 0xe8, 0x10, 0x3f, 0xf0, 0xe2, 0x87, 0x5d, 0xfa, 0x9a, 0xbf, 0xa2, 0xe7, 0x25, 0xba, 0x7a, 0x23, + 0x56, 0xcd, 0xaf, 0x5e, 0x6d, 0xa6, 0xbe, 0x7e, 0xb5, 0x99, 0xfa, 0xcf, 0xab, 0xcd, 0xd4, 0x6f, + 0x5e, 0x6f, 0xce, 0x7c, 0xfd, 0x7a, 0x73, 0xe6, 0x5f, 0xaf, 0x37, 0x67, 0x9e, 0x7e, 0x34, 0xbd, + 0xa2, 0xc1, 0xff, 0xab, 0x9c, 0xe4, 0x24, 0xe3, 0x7b, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xa1, + 0x62, 0x23, 0xbf, 0x7d, 0x19, 0x00, 0x00, } func (m *FundingUpdateV1) Marshal() (dAtA []byte, err error) { @@ -3648,7 +3648,7 @@ func (m *UpdatePerpetualEventV1) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *TradingRewardEventV1) Marshal() (dAtA []byte, err error) { +func (m *TradingRewardsEventV1) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3658,12 +3658,12 @@ func (m *TradingRewardEventV1) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *TradingRewardEventV1) MarshalTo(dAtA []byte) (int, error) { +func (m *TradingRewardsEventV1) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *TradingRewardEventV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TradingRewardsEventV1) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3706,9 +3706,9 @@ func (m *AddressTradingReward) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size := m.Denoms.Size() + size := m.DenomAmount.Size() i -= size - if _, err := m.Denoms.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.DenomAmount.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintEvents(dAtA, i, uint64(size)) @@ -4355,7 +4355,7 @@ func (m *UpdatePerpetualEventV1) Size() (n int) { return n } -func (m *TradingRewardEventV1) Size() (n int) { +func (m *TradingRewardsEventV1) Size() (n int) { if m == nil { return 0 } @@ -4380,7 +4380,7 @@ func (m *AddressTradingReward) Size() (n int) { if l > 0 { n += 1 + l + sovEvents(uint64(l)) } - l = m.Denoms.Size() + l = m.DenomAmount.Size() n += 1 + l + sovEvents(uint64(l)) return n } @@ -7856,7 +7856,7 @@ func (m *UpdatePerpetualEventV1) Unmarshal(dAtA []byte) error { } return nil } -func (m *TradingRewardEventV1) Unmarshal(dAtA []byte) error { +func (m *TradingRewardsEventV1) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7879,10 +7879,10 @@ func (m *TradingRewardEventV1) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: TradingRewardEventV1: wiretype end group for non-group") + return fmt.Errorf("proto: TradingRewardsEventV1: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: TradingRewardEventV1: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: TradingRewardsEventV1: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -8003,7 +8003,7 @@ func (m *AddressTradingReward) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Denoms", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DenomAmount", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -8030,7 +8030,7 @@ func (m *AddressTradingReward) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Denoms.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.DenomAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex