From d2d783033d00141f0c3255e6d325b4ea47e8b5a9 Mon Sep 17 00:00:00 2001 From: Amit Yadav Date: Fri, 6 Dec 2024 16:15:31 +0530 Subject: [PATCH] Add a new field for external incentives apr (#1033) * add external apr * add external reward --- api/elys/masterchef/query.pulsar.go | 359 +++++++++++++--------- proto/elys/masterchef/query.proto | 5 + x/masterchef/keeper/query_pool_rewards.go | 52 +++- x/masterchef/types/query.pb.go | 262 +++++++++------- 4 files changed, 424 insertions(+), 254 deletions(-) diff --git a/api/elys/masterchef/query.pulsar.go b/api/elys/masterchef/query.pulsar.go index d534e54a7..860b0fa94 100644 --- a/api/elys/masterchef/query.pulsar.go +++ b/api/elys/masterchef/query.pulsar.go @@ -13029,11 +13029,12 @@ func (x *_PoolRewards_3_list) IsValid() bool { } var ( - md_PoolRewards protoreflect.MessageDescriptor - fd_PoolRewards_pool_id protoreflect.FieldDescriptor - fd_PoolRewards_rewards_usd protoreflect.FieldDescriptor - fd_PoolRewards_reward_coins protoreflect.FieldDescriptor - fd_PoolRewards_eden_forward protoreflect.FieldDescriptor + md_PoolRewards protoreflect.MessageDescriptor + fd_PoolRewards_pool_id protoreflect.FieldDescriptor + fd_PoolRewards_rewards_usd protoreflect.FieldDescriptor + fd_PoolRewards_reward_coins protoreflect.FieldDescriptor + fd_PoolRewards_eden_forward protoreflect.FieldDescriptor + fd_PoolRewards_external_rewards_apr protoreflect.FieldDescriptor ) func init() { @@ -13043,6 +13044,7 @@ func init() { fd_PoolRewards_rewards_usd = md_PoolRewards.Fields().ByName("rewards_usd") fd_PoolRewards_reward_coins = md_PoolRewards.Fields().ByName("reward_coins") fd_PoolRewards_eden_forward = md_PoolRewards.Fields().ByName("eden_forward") + fd_PoolRewards_external_rewards_apr = md_PoolRewards.Fields().ByName("external_rewards_apr") } var _ protoreflect.Message = (*fastReflection_PoolRewards)(nil) @@ -13134,6 +13136,12 @@ func (x *fastReflection_PoolRewards) Range(f func(protoreflect.FieldDescriptor, return } } + if x.ExternalRewardsApr != "" { + value := protoreflect.ValueOfString(x.ExternalRewardsApr) + if !f(fd_PoolRewards_external_rewards_apr, value) { + return + } + } } // Has reports whether a field is populated. @@ -13157,6 +13165,8 @@ func (x *fastReflection_PoolRewards) Has(fd protoreflect.FieldDescriptor) bool { return len(x.RewardCoins) != 0 case "elys.masterchef.PoolRewards.eden_forward": return x.EdenForward != nil + case "elys.masterchef.PoolRewards.external_rewards_apr": + return x.ExternalRewardsApr != "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: elys.masterchef.PoolRewards")) @@ -13181,6 +13191,8 @@ func (x *fastReflection_PoolRewards) Clear(fd protoreflect.FieldDescriptor) { x.RewardCoins = nil case "elys.masterchef.PoolRewards.eden_forward": x.EdenForward = nil + case "elys.masterchef.PoolRewards.external_rewards_apr": + x.ExternalRewardsApr = "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: elys.masterchef.PoolRewards")) @@ -13212,6 +13224,9 @@ func (x *fastReflection_PoolRewards) Get(descriptor protoreflect.FieldDescriptor case "elys.masterchef.PoolRewards.eden_forward": value := x.EdenForward return protoreflect.ValueOfMessage(value.ProtoReflect()) + case "elys.masterchef.PoolRewards.external_rewards_apr": + value := x.ExternalRewardsApr + return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: elys.masterchef.PoolRewards")) @@ -13242,6 +13257,8 @@ func (x *fastReflection_PoolRewards) Set(fd protoreflect.FieldDescriptor, value x.RewardCoins = *clv.list case "elys.masterchef.PoolRewards.eden_forward": x.EdenForward = value.Message().Interface().(*v1beta1.Coin) + case "elys.masterchef.PoolRewards.external_rewards_apr": + x.ExternalRewardsApr = value.Interface().(string) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: elys.masterchef.PoolRewards")) @@ -13277,6 +13294,8 @@ func (x *fastReflection_PoolRewards) Mutable(fd protoreflect.FieldDescriptor) pr panic(fmt.Errorf("field pool_id of message elys.masterchef.PoolRewards is not mutable")) case "elys.masterchef.PoolRewards.rewards_usd": panic(fmt.Errorf("field rewards_usd of message elys.masterchef.PoolRewards is not mutable")) + case "elys.masterchef.PoolRewards.external_rewards_apr": + panic(fmt.Errorf("field external_rewards_apr of message elys.masterchef.PoolRewards is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: elys.masterchef.PoolRewards")) @@ -13300,6 +13319,8 @@ func (x *fastReflection_PoolRewards) NewField(fd protoreflect.FieldDescriptor) p case "elys.masterchef.PoolRewards.eden_forward": m := new(v1beta1.Coin) return protoreflect.ValueOfMessage(m.ProtoReflect()) + case "elys.masterchef.PoolRewards.external_rewards_apr": + return protoreflect.ValueOfString("") default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: elys.masterchef.PoolRewards")) @@ -13386,6 +13407,10 @@ func (x *fastReflection_PoolRewards) ProtoMethods() *protoiface.Methods { l = options.Size(x.EdenForward) n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.ExternalRewardsApr) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -13415,6 +13440,13 @@ func (x *fastReflection_PoolRewards) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.ExternalRewardsApr) > 0 { + i -= len(x.ExternalRewardsApr) + copy(dAtA[i:], x.ExternalRewardsApr) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ExternalRewardsApr))) + i-- + dAtA[i] = 0x2a + } if x.EdenForward != nil { encoded, err := options.Marshal(x.EdenForward) if err != nil { @@ -13627,6 +13659,38 @@ func (x *fastReflection_PoolRewards) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex + case 5: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ExternalRewardsApr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.ExternalRewardsApr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -15247,10 +15311,11 @@ type PoolRewards struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"` - RewardsUsd string `protobuf:"bytes,2,opt,name=rewards_usd,json=rewardsUsd,proto3" json:"rewards_usd,omitempty"` - RewardCoins []*v1beta1.Coin `protobuf:"bytes,3,rep,name=reward_coins,json=rewardCoins,proto3" json:"reward_coins,omitempty"` - EdenForward *v1beta1.Coin `protobuf:"bytes,4,opt,name=eden_forward,json=edenForward,proto3" json:"eden_forward,omitempty"` + PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"` + RewardsUsd string `protobuf:"bytes,2,opt,name=rewards_usd,json=rewardsUsd,proto3" json:"rewards_usd,omitempty"` + RewardCoins []*v1beta1.Coin `protobuf:"bytes,3,rep,name=reward_coins,json=rewardCoins,proto3" json:"reward_coins,omitempty"` + EdenForward *v1beta1.Coin `protobuf:"bytes,4,opt,name=eden_forward,json=edenForward,proto3" json:"eden_forward,omitempty"` + ExternalRewardsApr string `protobuf:"bytes,5,opt,name=external_rewards_apr,json=externalRewardsApr,proto3" json:"external_rewards_apr,omitempty"` } func (x *PoolRewards) Reset() { @@ -15301,6 +15366,13 @@ func (x *PoolRewards) GetEdenForward() *v1beta1.Coin { return nil } +func (x *PoolRewards) GetExternalRewardsApr() string { + if x != nil { + return x.ExternalRewardsApr + } + return "" +} + type QueryPoolRewardsResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -15566,7 +15638,7 @@ var file_elys_masterchef_query_proto_rawDesc = []byte{ 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0xae, 0x02, 0x0a, 0x0b, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, + 0x93, 0x03, 0x0a, 0x0b, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x70, 0x6f, 0x6f, 0x6c, 0x49, 0x64, 0x12, 0x52, 0x0a, 0x0b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x5f, 0x75, 0x73, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, 0xc8, @@ -15585,149 +15657,156 @@ var file_elys_masterchef_query_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0b, 0x65, 0x64, 0x65, 0x6e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, - 0x22, 0x54, 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x05, - 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x6c, - 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x50, 0x6f, - 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, - 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x32, 0xdc, 0x0f, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, - 0x12, 0x81, 0x01, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x23, 0x2e, 0x65, 0x6c, - 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x24, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x12, 0x63, 0x0a, 0x14, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x73, 0x5f, 0x61, 0x70, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, + 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, + 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, + 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, + 0x63, 0x52, 0x12, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x73, 0x41, 0x70, 0x72, 0x22, 0x54, 0x0a, 0x18, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, + 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x38, 0x0a, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1c, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x65, 0x66, 0x2e, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x42, 0x04, + 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x32, 0xdc, 0x0f, 0x0a, 0x05, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x81, 0x01, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, + 0x12, 0x23, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x26, 0x12, 0x24, - 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, - 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x12, 0xae, 0x01, 0x0a, 0x11, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x49, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x76, 0x65, 0x12, 0x2e, 0x2e, 0x65, 0x6c, 0x79, - 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x63, 0x65, 0x6e, 0x74, - 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x65, 0x6c, 0x79, - 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x63, 0x65, 0x6e, 0x74, - 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x32, 0x12, 0x30, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, + 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, + 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x26, 0x12, 0x24, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, - 0x65, 0x66, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x69, 0x6e, 0x63, 0x65, - 0x6e, 0x74, 0x69, 0x76, 0x65, 0x12, 0x8a, 0x01, 0x0a, 0x08, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x25, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, - 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x65, 0x6c, 0x79, 0x73, - 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x65, 0x6c, 0x79, 0x73, - 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x69, 0x6e, - 0x66, 0x6f, 0x12, 0xa3, 0x01, 0x0a, 0x0e, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, - 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, - 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, - 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, + 0x65, 0x66, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0xae, 0x01, 0x0a, 0x11, 0x45, 0x78, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x76, 0x65, 0x12, + 0x2e, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, + 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, + 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x2f, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, + 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x49, + 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x38, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x32, 0x12, 0x30, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, - 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x72, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0xa3, 0x01, 0x0a, 0x0e, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x2e, 0x65, 0x6c, - 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, - 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, - 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, - 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, - 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x75, 0x73, - 0x65, 0x72, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0xaa, - 0x01, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x12, 0x2e, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, - 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, - 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, - 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, - 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x12, 0x2c, 0x2f, - 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, - 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x65, 0x6e, - 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0xab, 0x01, 0x0a, 0x0e, - 0x53, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x6b, 0x65, 0x41, 0x70, 0x72, 0x12, 0x2b, + 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x5f, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x76, 0x65, 0x12, 0x8a, 0x01, 0x0a, 0x08, 0x50, + 0x6f, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, + 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, + 0x6f, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, - 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x6b, - 0x65, 0x41, 0x70, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x65, 0x6c, - 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x6b, 0x65, 0x41, 0x70, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3e, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x38, 0x12, 0x36, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, - 0x2f, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x5f, 0x61, 0x70, - 0x72, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x7d, 0x12, 0x8a, 0x01, 0x0a, 0x08, 0x50, 0x6f, - 0x6f, 0x6c, 0x41, 0x70, 0x72, 0x73, 0x12, 0x25, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, - 0x6f, 0x6c, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, - 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, - 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, + 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, + 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, + 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x6f, + 0x6f, 0x6c, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0xa3, 0x01, 0x0a, 0x0e, 0x50, 0x6f, 0x6f, 0x6c, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x2e, 0x65, 0x6c, 0x79, + 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, + 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, + 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x6f, 0x6f, - 0x6c, 0x5f, 0x61, 0x70, 0x72, 0x73, 0x12, 0x9e, 0x01, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x77, 0x46, - 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x28, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x68, - 0x6f, 0x77, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x29, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, - 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x68, 0x6f, 0x77, 0x46, 0x65, 0x65, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3a, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x34, 0x12, 0x32, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x6c, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0xa3, 0x01, + 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, + 0x12, 0x2b, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, + 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, - 0x65, 0x66, 0x2f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x66, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, - 0x2f, 0x7b, 0x64, 0x61, 0x74, 0x65, 0x7d, 0x12, 0x97, 0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, - 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x28, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, - 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, - 0x69, 0x73, 0x74, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x29, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, - 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x65, 0x65, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x2d, 0x12, 0x2b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, - 0x68, 0x65, 0x66, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x66, 0x65, 0x65, 0x5f, 0x69, 0x6e, 0x66, - 0x6f, 0x12, 0x8d, 0x01, 0x0a, 0x03, 0x41, 0x70, 0x72, 0x12, 0x20, 0x2e, 0x65, 0x6c, 0x79, 0x73, + 0x65, 0x66, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x69, + 0x6e, 0x66, 0x6f, 0x12, 0xaa, 0x01, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x50, 0x65, 0x6e, 0x64, + 0x69, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x2e, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x41, 0x70, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x65, 0x6c, - 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x41, 0x70, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x41, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3b, 0x12, 0x39, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, - 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x61, 0x70, 0x72, 0x2f, 0x7b, 0x77, 0x69, 0x74, 0x68, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x7d, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, - 0x7d, 0x12, 0x79, 0x0a, 0x04, 0x41, 0x70, 0x72, 0x73, 0x12, 0x21, 0x2e, 0x65, 0x6c, 0x79, 0x73, + 0x79, 0x55, 0x73, 0x65, 0x72, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x65, - 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, + 0x79, 0x55, 0x73, 0x65, 0x72, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x2e, 0x12, 0x2c, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, + 0x66, 0x2f, 0x70, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x12, 0xab, 0x01, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x6b, 0x65, + 0x41, 0x70, 0x72, 0x12, 0x2b, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, + 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x53, 0x74, 0x61, 0x6b, 0x65, 0x41, 0x70, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x2c, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, + 0x61, 0x6b, 0x65, 0x41, 0x70, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3e, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x38, 0x12, 0x36, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, + 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, + 0x6b, 0x65, 0x5f, 0x61, 0x70, 0x72, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x7d, 0x12, 0x8a, + 0x01, 0x0a, 0x08, 0x50, 0x6f, 0x6f, 0x6c, 0x41, 0x70, 0x72, 0x73, 0x12, 0x25, 0x2e, 0x65, 0x6c, + 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, + 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x41, 0x70, + 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x29, 0x12, 0x27, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, + 0x66, 0x2f, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x61, 0x70, 0x72, 0x73, 0x12, 0x9e, 0x01, 0x0a, 0x0b, + 0x53, 0x68, 0x6f, 0x77, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x28, 0x2e, 0x65, 0x6c, + 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x53, 0x68, 0x6f, 0x77, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, + 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x68, 0x6f, + 0x77, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x3a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x34, 0x12, 0x32, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, - 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x61, 0x70, 0x72, 0x73, 0x12, 0x96, 0x01, 0x0a, - 0x0b, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x28, 0x2e, 0x65, + 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x66, 0x65, 0x65, + 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x2f, 0x7b, 0x64, 0x61, 0x74, 0x65, 0x7d, 0x12, 0x97, 0x01, 0x0a, + 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x28, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x52, + 0x75, 0x65, 0x72, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, - 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x12, 0x2a, 0x2f, 0x65, 0x6c, 0x79, 0x73, + 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4c, 0x69, + 0x73, 0x74, 0x46, 0x65, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x12, 0x2b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x72, 0x65, - 0x77, 0x61, 0x72, 0x64, 0x73, 0x42, 0xb0, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x6c, - 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x42, 0x0a, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x6c, - 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0xa2, 0x02, 0x03, - 0x45, 0x4d, 0x58, 0xaa, 0x02, 0x0f, 0x45, 0x6c, 0x79, 0x73, 0x2e, 0x4d, 0x61, 0x73, 0x74, 0x65, - 0x72, 0x63, 0x68, 0x65, 0x66, 0xca, 0x02, 0x0f, 0x45, 0x6c, 0x79, 0x73, 0x5c, 0x4d, 0x61, 0x73, - 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0xe2, 0x02, 0x1b, 0x45, 0x6c, 0x79, 0x73, 0x5c, 0x4d, - 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x10, 0x45, 0x6c, 0x79, 0x73, 0x3a, 0x3a, 0x4d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x66, 0x65, + 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x8d, 0x01, 0x0a, 0x03, 0x41, 0x70, 0x72, 0x12, 0x20, + 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, + 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x70, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x21, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x70, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x41, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3b, 0x12, 0x39, 0x2f, 0x65, 0x6c, + 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, + 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x61, 0x70, 0x72, 0x2f, 0x7b, + 0x77, 0x69, 0x74, 0x68, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x7d, 0x2f, 0x7b, + 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x7d, 0x12, 0x79, 0x0a, 0x04, 0x41, 0x70, 0x72, 0x73, 0x12, 0x21, + 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, + 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x22, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, + 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x70, 0x72, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x12, 0x22, 0x2f, + 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, + 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x61, 0x70, 0x72, + 0x73, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x73, 0x12, 0x28, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, + 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x65, 0x6c, + 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x12, 0x2a, + 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, + 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x2f, 0x70, 0x6f, + 0x6f, 0x6c, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x42, 0xb0, 0x01, 0x0a, 0x13, 0x63, + 0x6f, 0x6d, 0x2e, 0x65, 0x6c, 0x79, 0x73, 0x2e, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x65, 0x66, 0x42, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6c, 0x79, + 0x73, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x65, 0x6c, 0x79, 0x73, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, + 0x65, 0x66, 0xa2, 0x02, 0x03, 0x45, 0x4d, 0x58, 0xaa, 0x02, 0x0f, 0x45, 0x6c, 0x79, 0x73, 0x2e, + 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0xca, 0x02, 0x0f, 0x45, 0x6c, 0x79, + 0x73, 0x5c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0xe2, 0x02, 0x1b, 0x45, + 0x6c, 0x79, 0x73, 0x5c, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x5c, 0x47, + 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x10, 0x45, 0x6c, 0x79, + 0x73, 0x3a, 0x3a, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x63, 0x68, 0x65, 0x66, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/elys/masterchef/query.proto b/proto/elys/masterchef/query.proto index 95662c88e..a3b5d791d 100644 --- a/proto/elys/masterchef/query.proto +++ b/proto/elys/masterchef/query.proto @@ -272,6 +272,11 @@ message PoolRewards { (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; cosmos.base.v1beta1.Coin eden_forward = 4 [ (gogoproto.nullable) = false ]; + string external_rewards_apr = 5 [ + (cosmos_proto.scalar) = "cosmos.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (gogoproto.nullable) = false + ]; } message QueryPoolRewardsResponse { repeated PoolRewards pools = 1 [ (gogoproto.nullable) = false ]; diff --git a/x/masterchef/keeper/query_pool_rewards.go b/x/masterchef/keeper/query_pool_rewards.go index 4d1dd980f..0715564f1 100644 --- a/x/masterchef/keeper/query_pool_rewards.go +++ b/x/masterchef/keeper/query_pool_rewards.go @@ -3,6 +3,7 @@ package keeper import ( "context" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" ammtypes "github.com/elys-network/elys/x/amm/types" "github.com/elys-network/elys/x/masterchef/types" @@ -20,6 +21,9 @@ func (k Keeper) PoolRewards(goCtx context.Context, req *types.QueryPoolRewardsRe pools := make([]types.PoolRewards, 0) skipCount := uint64(0) + // calculate external rewards APR + externalRewardsAprs := k.generateExternalRewardsApr(ctx) + // If we have pool Ids specified, if len(req.PoolIds) > 0 { for _, pId := range req.PoolIds { @@ -40,7 +44,7 @@ func (k Keeper) PoolRewards(goCtx context.Context, req *types.QueryPoolRewardsRe } // Construct earn pool - earnPool := k.generatePoolRewards(ctx, &pool) + earnPool := k.generatePoolRewards(ctx, &pool, externalRewardsAprs) pools = append(pools, earnPool) } } else { @@ -57,7 +61,7 @@ func (k Keeper) PoolRewards(goCtx context.Context, req *types.QueryPoolRewardsRe } // Construct earn pool - poolRewards := k.generatePoolRewards(ctx, &p) + poolRewards := k.generatePoolRewards(ctx, &p, externalRewardsAprs) pools = append(pools, poolRewards) return false @@ -70,15 +74,49 @@ func (k Keeper) PoolRewards(goCtx context.Context, req *types.QueryPoolRewardsRe } // Generate earn pool struct -func (k *Keeper) generatePoolRewards(ctx sdk.Context, ammPool *ammtypes.Pool) types.PoolRewards { +func (k *Keeper) generatePoolRewards(ctx sdk.Context, ammPool *ammtypes.Pool, externalRewardsAprs map[uint64]math.LegacyDec) types.PoolRewards { // Get rewards amount rewardsUsd, rewardCoins := k.GetDailyRewardsAmountForPool(ctx, ammPool.PoolId) edenForward := sdk.NewCoin(ptypes.Eden, k.ForwardEdenCalc(ctx, ammPool.PoolId).RoundInt()) return types.PoolRewards{ - PoolId: ammPool.PoolId, - RewardsUsd: rewardsUsd, - RewardCoins: rewardCoins, - EdenForward: edenForward, + PoolId: ammPool.PoolId, + RewardsUsd: rewardsUsd, + RewardCoins: rewardCoins, + EdenForward: edenForward, + ExternalRewardsApr: externalRewardsAprs[ammPool.PoolId], + } +} + +func (k Keeper) generateExternalRewardsApr(ctx sdk.Context) map[uint64]math.LegacyDec { + externalIncentives := k.GetAllExternalIncentives(ctx) + rewardsPerPool := make(map[uint64]math.LegacyDec) + curBlockHeight := ctx.BlockHeight() + totalBlocksPerYear := int64(k.parameterKeeper.GetParams(ctx).TotalBlocksPerYear) + + for _, externalIncentive := range externalIncentives { + if externalIncentive.FromBlock < curBlockHeight && curBlockHeight <= externalIncentive.ToBlock { + totalAmount := math.LegacyNewDecFromInt(externalIncentive.AmountPerBlock.Mul(math.NewInt(totalBlocksPerYear))) + price := k.oracleKeeper.GetAssetPriceFromDenom(ctx, externalIncentive.RewardDenom) + + rewardsPerPool[externalIncentive.PoolId] = rewardsPerPool[externalIncentive.PoolId].Add(totalAmount.Mul(price)) + } + } + + // Convert all rewards to APR + // Traverse rewardsPerPool map + for key, value := range rewardsPerPool { + // Get total pool liquidity + pool, found := k.amm.GetPool(ctx, key) + if !found { + continue + } + totalLiquidity, err := pool.TVL(ctx, k.oracleKeeper, k.accountedPoolKeeper) + if err != nil { + rewardsPerPool[key] = math.LegacyZeroDec() + } + externalRewardsApr := value.Quo(totalLiquidity) + rewardsPerPool[key] = externalRewardsApr } + return rewardsPerPool } diff --git a/x/masterchef/types/query.pb.go b/x/masterchef/types/query.pb.go index 0148b56e4..400b192ea 100644 --- a/x/masterchef/types/query.pb.go +++ b/x/masterchef/types/query.pb.go @@ -1250,10 +1250,11 @@ func (m *QueryPoolRewardsRequest) GetPagination() *query.PageRequest { } type PoolRewards struct { - PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"` - RewardsUsd cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=rewards_usd,json=rewardsUsd,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"rewards_usd"` - RewardCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=reward_coins,json=rewardCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"reward_coins"` - EdenForward types.Coin `protobuf:"bytes,4,opt,name=eden_forward,json=edenForward,proto3" json:"eden_forward"` + PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"` + RewardsUsd cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=rewards_usd,json=rewardsUsd,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"rewards_usd"` + RewardCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=reward_coins,json=rewardCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"reward_coins"` + EdenForward types.Coin `protobuf:"bytes,4,opt,name=eden_forward,json=edenForward,proto3" json:"eden_forward"` + ExternalRewardsApr cosmossdk_io_math.LegacyDec `protobuf:"bytes,5,opt,name=external_rewards_apr,json=externalRewardsApr,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"external_rewards_apr"` } func (m *PoolRewards) Reset() { *m = PoolRewards{} } @@ -1389,109 +1390,110 @@ func init() { func init() { proto.RegisterFile("elys/masterchef/query.proto", fileDescriptor_e4939d0b7ced5d80) } var fileDescriptor_e4939d0b7ced5d80 = []byte{ - // 1621 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0x13, 0x57, - 0x16, 0xce, 0x38, 0x4e, 0xec, 0x1c, 0x87, 0x40, 0xee, 0x66, 0x85, 0xe3, 0xb0, 0x4e, 0xb8, 0xcb, - 0xb2, 0x01, 0x12, 0x0f, 0x31, 0x2c, 0x82, 0xdd, 0x15, 0x52, 0xc2, 0x0f, 0x29, 0xda, 0x68, 0x97, - 0x35, 0x44, 0x54, 0x7d, 0xb1, 0xc6, 0x9e, 0x1b, 0x67, 0x14, 0x7b, 0x66, 0x98, 0x3b, 0x21, 0x58, - 0x94, 0x07, 0xfa, 0x88, 0xd4, 0xaa, 0x52, 0xa5, 0xf6, 0xad, 0x2f, 0x7d, 0xa3, 0x12, 0x4f, 0xfd, - 0x23, 0xe8, 0x1b, 0x6a, 0x5f, 0xaa, 0xaa, 0xa2, 0x15, 0xf4, 0x0f, 0xa9, 0xee, 0xbd, 0x67, 0xec, - 0x19, 0x8f, 0xc7, 0x31, 0x0e, 0x7d, 0x8a, 0x67, 0xee, 0xb9, 0xdf, 0xf9, 0xce, 0xb9, 0xe7, 0xdc, - 0x39, 0x5f, 0x60, 0x81, 0x35, 0xdb, 0x5c, 0x6f, 0x19, 0xdc, 0x67, 0x5e, 0x7d, 0x97, 0xed, 0xe8, - 0x0f, 0xf6, 0x99, 0xd7, 0x2e, 0xb9, 0x9e, 0xe3, 0x3b, 0xe4, 0xb8, 0x58, 0x2c, 0x75, 0x17, 0x0b, - 0x73, 0x0d, 0xa7, 0xe1, 0xc8, 0x35, 0x5d, 0xfc, 0x52, 0x66, 0x85, 0x53, 0x0d, 0xc7, 0x69, 0x34, - 0x99, 0x6e, 0xb8, 0x96, 0x6e, 0xd8, 0xb6, 0xe3, 0x1b, 0xbe, 0xe5, 0xd8, 0x1c, 0x57, 0xcf, 0xd7, - 0x1d, 0xde, 0x72, 0xb8, 0x5e, 0x33, 0x38, 0x53, 0xe8, 0xfa, 0xc3, 0xb5, 0x1a, 0xf3, 0x8d, 0x35, - 0xdd, 0x35, 0x1a, 0x96, 0x2d, 0x8d, 0xd1, 0xb6, 0x18, 0xb6, 0x0d, 0xac, 0xea, 0x8e, 0x15, 0xac, - 0x9f, 0xea, 0x65, 0xeb, 0x1a, 0x9e, 0xd1, 0x0a, 0x3c, 0x2d, 0xf7, 0xae, 0xb2, 0x47, 0x3e, 0xf3, - 0x6c, 0xa3, 0x59, 0xb5, 0xec, 0x3a, 0xb3, 0x7d, 0xeb, 0x21, 0x43, 0xcb, 0x42, 0x0c, 0xc7, 0x71, - 0x9a, 0xb8, 0x16, 0xcb, 0x88, 0xdf, 0x76, 0x19, 0x8f, 0x10, 0xa8, 0x3b, 0xad, 0x96, 0xe5, 0xb7, - 0x98, 0xed, 0x47, 0x09, 0xcc, 0x2b, 0xfa, 0x55, 0x95, 0x21, 0xf5, 0xa0, 0x96, 0xe8, 0x1c, 0x90, - 0xff, 0x8b, 0xd8, 0xef, 0x48, 0xfb, 0x0a, 0x7b, 0xb0, 0xcf, 0xb8, 0x4f, 0xb7, 0xe0, 0x4f, 0x91, - 0xb7, 0xdc, 0x75, 0x6c, 0xce, 0xc8, 0x3f, 0x60, 0x52, 0xe1, 0xe6, 0xb5, 0x25, 0x6d, 0x39, 0x57, - 0x3e, 0x59, 0xea, 0x39, 0x88, 0x92, 0xda, 0xb0, 0x91, 0x7e, 0xf9, 0x7a, 0x71, 0xac, 0x82, 0xc6, - 0x54, 0x87, 0xbf, 0x48, 0xb4, 0x5b, 0x18, 0xf6, 0x66, 0x10, 0x35, 0xba, 0x23, 0x33, 0x90, 0xb2, - 0x4c, 0x89, 0x99, 0xae, 0xa4, 0x2c, 0x93, 0xb6, 0xa1, 0x98, 0xb4, 0x01, 0x99, 0xdc, 0x07, 0x12, - 0x4f, 0x22, 0xb2, 0xa2, 0x31, 0x56, 0x31, 0x1c, 0x24, 0x38, 0xcb, 0x7a, 0x17, 0xa8, 0x0e, 0x73, - 0x2a, 0x72, 0xc7, 0x69, 0x6e, 0xda, 0x3b, 0x4e, 0x40, 0xf1, 0x24, 0x64, 0xc4, 0x59, 0x54, 0x3b, - 0x3c, 0x27, 0xc5, 0xe3, 0xa6, 0x49, 0xb7, 0xe1, 0xcf, 0x3d, 0x1b, 0x90, 0xe2, 0xbf, 0x61, 0x4a, - 0xed, 0xb0, 0x77, 0x1c, 0x64, 0x36, 0x1f, 0xcf, 0x17, 0xee, 0x42, 0x42, 0x59, 0x17, 0x9f, 0xe9, - 0x07, 0x50, 0xe8, 0xc0, 0x56, 0xd8, 0x81, 0xe1, 0x99, 0xc3, 0xb0, 0x21, 0xa7, 0x61, 0xda, 0x93, - 0xd6, 0x55, 0x93, 0xd9, 0x4e, 0x2b, 0x9f, 0x5a, 0xd2, 0x96, 0xa7, 0x2a, 0x39, 0xf5, 0xee, 0xa6, - 0x78, 0x45, 0x6d, 0x58, 0xe8, 0x8b, 0x8c, 0xb4, 0xff, 0x07, 0x27, 0x24, 0x34, 0xc2, 0x84, 0xd8, - 0x2f, 0xf6, 0x65, 0xdf, 0x85, 0xc0, 0x18, 0x66, 0xdc, 0xc8, 0x5b, 0xda, 0xc4, 0x48, 0xb6, 0x39, - 0xf3, 0xe2, 0x91, 0x10, 0x48, 0xef, 0x73, 0xe6, 0x49, 0x17, 0x53, 0x15, 0xf9, 0x3b, 0x1c, 0x5d, - 0x6a, 0x60, 0x74, 0xe3, 0xc9, 0xd1, 0xf5, 0x7a, 0xeb, 0x46, 0x27, 0x5c, 0x0c, 0x15, 0x5d, 0x14, - 0x22, 0x88, 0x6e, 0x3f, 0xf2, 0x96, 0x5e, 0xc2, 0xda, 0x16, 0xc6, 0x77, 0x98, 0x6d, 0x5a, 0x76, - 0x43, 0xad, 0x0e, 0x08, 0x90, 0x3e, 0xd3, 0x00, 0xba, 0x18, 0xc9, 0xa7, 0x59, 0x87, 0x49, 0x45, - 0x34, 0x9f, 0x5a, 0x1a, 0x97, 0xf5, 0x83, 0xbd, 0x2b, 0xee, 0xa1, 0x12, 0xde, 0x43, 0xa5, 0x1b, - 0x8e, 0x65, 0x6f, 0x5c, 0x14, 0xec, 0x9e, 0xff, 0xb2, 0xb8, 0xdc, 0xb0, 0xfc, 0xdd, 0xfd, 0x5a, - 0xa9, 0xee, 0xb4, 0xb0, 0xd1, 0xf1, 0xcf, 0x2a, 0x37, 0xf7, 0xf0, 0xca, 0x10, 0x1b, 0x78, 0x05, - 0xa1, 0xe9, 0x77, 0x1a, 0x76, 0x5b, 0x9f, 0x10, 0x3a, 0x7d, 0x9f, 0x51, 0xc6, 0xa2, 0xf1, 0x05, - 0x91, 0x85, 0x58, 0xb2, 0x42, 0xb9, 0x0e, 0x6c, 0x89, 0x0b, 0xc7, 0x7c, 0xc7, 0x37, 0x82, 0x5a, - 0xe2, 0x7f, 0x44, 0x14, 0xd3, 0xd2, 0x83, 0xf2, 0xce, 0x69, 0x19, 0x6b, 0xed, 0xae, 0x6f, 0xd4, - 0x9a, 0xec, 0xae, 0x6f, 0xec, 0xb1, 0x75, 0xd7, 0x0b, 0x8e, 0x62, 0x0e, 0x26, 0x54, 0xdd, 0xa8, - 0xb3, 0x50, 0x0f, 0xb4, 0x86, 0x15, 0xd3, 0xbb, 0x07, 0x63, 0xbf, 0x01, 0xe3, 0x86, 0x8b, 0xc7, - 0xb7, 0xb1, 0x26, 0xf8, 0xfd, 0xf4, 0x7a, 0x71, 0x41, 0xb1, 0xe1, 0xe6, 0x5e, 0xc9, 0x72, 0xf4, - 0x96, 0xe1, 0xef, 0x96, 0xb6, 0x58, 0xc3, 0xa8, 0xb7, 0x6f, 0xb2, 0xfa, 0xf7, 0xdf, 0xae, 0x02, - 0x06, 0x78, 0x93, 0xd5, 0x2b, 0x62, 0x37, 0x5d, 0x0b, 0xdd, 0x2a, 0xeb, 0xae, 0x17, 0xdc, 0xb3, - 0x64, 0x1e, 0xb2, 0x78, 0xf2, 0x2a, 0xb3, 0xe9, 0x4a, 0x46, 0x1d, 0x3d, 0xa7, 0xff, 0x09, 0xdd, - 0x2b, 0x6a, 0x0b, 0x12, 0x2a, 0x43, 0xda, 0x34, 0x7c, 0x03, 0x4f, 0x22, 0xdf, 0xb7, 0x29, 0xd7, - 0x5d, 0x0f, 0xeb, 0x55, 0xda, 0xd2, 0x4f, 0x53, 0x90, 0xc1, 0xf7, 0xc9, 0xd5, 0xb6, 0x05, 0x59, - 0x66, 0x32, 0xbb, 0x2a, 0xc2, 0x4d, 0x8d, 0x1a, 0x6e, 0x46, 0x40, 0x08, 0x37, 0x5b, 0x90, 0xdd, - 0xe7, 0x66, 0x5d, 0xa2, 0x8d, 0x8f, 0x8c, 0x26, 0x20, 0x04, 0xda, 0x7f, 0x61, 0x4a, 0x95, 0x92, - 0x80, 0x4b, 0x8f, 0x0a, 0x97, 0x95, 0x18, 0xeb, 0xae, 0x47, 0x57, 0xe1, 0xa4, 0x3a, 0xf4, 0x5d, - 0xe7, 0xe0, 0x36, 0x63, 0x3d, 0x37, 0x92, 0x69, 0xf8, 0x2c, 0x68, 0x58, 0xf1, 0x9b, 0x6e, 0x43, - 0x3e, 0x6e, 0x8e, 0xe7, 0x71, 0x0d, 0xb2, 0x3b, 0x8c, 0x85, 0xaf, 0x92, 0xf8, 0x99, 0xe0, 0x1e, - 0x3c, 0x93, 0xcc, 0x8e, 0x7a, 0xa4, 0xf3, 0xc8, 0x62, 0xcb, 0xe2, 0x7e, 0x94, 0x45, 0xc7, 0x63, - 0x64, 0xa9, 0xaf, 0xc7, 0xf1, 0x77, 0xf1, 0xd8, 0x80, 0xe3, 0x12, 0x36, 0xd4, 0x15, 0xd7, 0xe1, - 0xd8, 0x81, 0xe5, 0xef, 0x9a, 0x9e, 0x71, 0x50, 0x15, 0x9d, 0x25, 0x83, 0x98, 0x09, 0xbe, 0x55, - 0xdd, 0x91, 0xa2, 0x74, 0xcb, 0xf0, 0xec, 0x7b, 0x6d, 0x97, 0x55, 0xa6, 0x03, 0x7b, 0xf1, 0xd4, - 0xed, 0xaa, 0x54, 0xb8, 0xab, 0xee, 0xc3, 0x89, 0xae, 0xa3, 0xf7, 0xd9, 0x4a, 0xa4, 0x0b, 0xdc, - 0x19, 0x57, 0x9e, 0x66, 0x60, 0x36, 0xf4, 0x12, 0xdd, 0x6d, 0xc3, 0xb1, 0xa0, 0x02, 0xab, 0xe2, - 0xc7, 0xe8, 0x8e, 0x73, 0x58, 0x86, 0xdb, 0xdc, 0xac, 0x0b, 0xd8, 0xa0, 0x4d, 0x14, 0xec, 0xc8, - 0xbd, 0x92, 0xc3, 0x5e, 0x91, 0xb0, 0xf7, 0x61, 0xa6, 0xc3, 0x56, 0xbc, 0xaf, 0x8d, 0xde, 0x35, - 0xd3, 0x48, 0xf7, 0x96, 0x80, 0x11, 0xc0, 0x1d, 0xbe, 0x0a, 0x78, 0xe4, 0xfe, 0x99, 0x46, 0xc2, - 0x0a, 0x38, 0x9c, 0x5f, 0xb1, 0x90, 0x9f, 0x38, 0x6a, 0x7e, 0x05, 0x6e, 0x24, 0xbf, 0x12, 0x76, - 0xf2, 0xa8, 0xf9, 0x95, 0xb0, 0x98, 0x86, 0x5a, 0x17, 0x37, 0x73, 0xa4, 0x34, 0xd4, 0x42, 0x7c, - 0xbb, 0x69, 0x68, 0xb6, 0x79, 0x3e, 0x7b, 0xe4, 0x34, 0x34, 0xdb, 0x3c, 0x9a, 0x06, 0x01, 0x3b, - 0x75, 0xe4, 0x34, 0x08, 0xd8, 0x68, 0x1a, 0x04, 0x2e, 0x1c, 0x3d, 0x0d, 0xcd, 0x36, 0xa7, 0x1f, - 0xe1, 0x5d, 0xd6, 0x9d, 0x09, 0x87, 0xf8, 0xca, 0x91, 0xdb, 0x00, 0x5d, 0xb1, 0x25, 0x3b, 0x29, - 0x57, 0x3e, 0x1b, 0x99, 0x0f, 0x94, 0xee, 0x0b, 0xa6, 0x84, 0x3b, 0x46, 0x23, 0x50, 0x0d, 0x95, - 0xd0, 0x4e, 0xfa, 0x22, 0x05, 0xb9, 0x90, 0xe7, 0xe4, 0x8f, 0x5c, 0x05, 0x70, 0x5c, 0xe4, 0xa2, - 0x79, 0x47, 0xef, 0x5d, 0x40, 0x94, 0x6d, 0x6e, 0x12, 0xbb, 0x33, 0x96, 0x0a, 0x49, 0xc8, 0xf3, - 0xe3, 0xef, 0x7f, 0xcc, 0x41, 0xd2, 0xf2, 0x81, 0x6c, 0x80, 0x4c, 0x7d, 0x75, 0xc7, 0xf1, 0xe4, - 0x70, 0x98, 0x46, 0x71, 0x91, 0xe8, 0x4f, 0x7d, 0x04, 0x64, 0x1d, 0xdc, 0x56, 0x7b, 0xe8, 0x3d, - 0xfc, 0xbe, 0x44, 0x8e, 0x0b, 0x2f, 0xce, 0xab, 0x30, 0x21, 0xb2, 0x15, 0x0c, 0x7b, 0xa7, 0x06, - 0xcc, 0xfd, 0x81, 0xd4, 0x53, 0x1b, 0xca, 0x3f, 0x1f, 0x87, 0x09, 0x09, 0x4b, 0x9e, 0x6a, 0x30, - 0xa9, 0xc4, 0x20, 0xf9, 0x6b, 0x6c, 0x7f, 0x5c, 0x71, 0x16, 0xce, 0x0c, 0x36, 0x52, 0xcc, 0xe8, - 0xca, 0xc7, 0x3f, 0xfc, 0xf6, 0x79, 0xea, 0x2c, 0x39, 0xa3, 0x0b, 0xeb, 0x55, 0x9b, 0xf9, 0x07, - 0x8e, 0xb7, 0xa7, 0xf7, 0x57, 0xdf, 0xe4, 0x85, 0x06, 0xb3, 0x31, 0xe9, 0x47, 0x4a, 0xfd, 0x3d, - 0x25, 0x89, 0xd3, 0x82, 0x3e, 0xb4, 0x3d, 0x92, 0xbc, 0x2a, 0x49, 0x96, 0xc9, 0xc5, 0xc1, 0x24, - 0xe3, 0xfa, 0x95, 0x3c, 0xd3, 0x20, 0x1b, 0x28, 0x42, 0xf2, 0xb7, 0x84, 0x8c, 0x44, 0x85, 0x69, - 0xe1, 0xec, 0x61, 0x66, 0xc8, 0x4a, 0x97, 0xac, 0xce, 0x91, 0xbf, 0x1f, 0x92, 0xba, 0x40, 0xb2, - 0x92, 0xaf, 0x35, 0x98, 0x89, 0x0a, 0x3c, 0x72, 0x21, 0xd9, 0x57, 0x4c, 0xd9, 0x15, 0x56, 0x86, - 0x33, 0x46, 0x7a, 0x57, 0x24, 0xbd, 0x8b, 0xa4, 0x34, 0x04, 0xbd, 0x90, 0x78, 0x93, 0x2c, 0xa3, - 0x42, 0x2d, 0x89, 0x65, 0x5f, 0xfd, 0x99, 0xc4, 0xb2, 0xbf, 0x7c, 0x1c, 0x96, 0x65, 0xaf, 0xc4, - 0x24, 0xcf, 0x35, 0x98, 0x8d, 0xc9, 0xab, 0xa4, 0x4a, 0x4c, 0x92, 0x92, 0x49, 0x95, 0x98, 0xa8, - 0xdb, 0xe8, 0x65, 0x49, 0xb7, 0x44, 0x56, 0x0e, 0x49, 0xaa, 0xda, 0x8c, 0x8c, 0xc9, 0x37, 0x1a, - 0xcc, 0x44, 0xc5, 0x50, 0x52, 0x4a, 0xfb, 0xca, 0xac, 0xa4, 0x94, 0xf6, 0xd7, 0x57, 0xf4, 0xba, - 0xe4, 0x78, 0x95, 0x5c, 0x19, 0xcc, 0x91, 0xcb, 0xdd, 0x55, 0x2e, 0xb6, 0x8b, 0x6f, 0x97, 0xfe, - 0x58, 0xce, 0x99, 0x4f, 0x3a, 0x3d, 0x23, 0x46, 0xbf, 0x41, 0x3d, 0x13, 0x9a, 0x17, 0x07, 0xf5, - 0x4c, 0x78, 0x82, 0x7c, 0xa7, 0x9e, 0x31, 0x84, 0xff, 0xaf, 0x34, 0xc8, 0x85, 0x34, 0x02, 0x59, - 0x4e, 0x48, 0x45, 0x4c, 0x75, 0x14, 0xce, 0x0d, 0x61, 0x89, 0xac, 0xfe, 0x29, 0x59, 0x5d, 0x26, - 0xe5, 0x43, 0x32, 0xb6, 0xeb, 0x1c, 0x54, 0x03, 0x9d, 0xa0, 0x3f, 0x16, 0x3a, 0xe6, 0x09, 0xf9, - 0x52, 0x83, 0x5c, 0x48, 0x52, 0x24, 0x11, 0x8c, 0x0b, 0x92, 0x24, 0x82, 0x7d, 0xf4, 0x09, 0xbd, - 0x24, 0x09, 0xae, 0x92, 0x0b, 0x83, 0x09, 0x36, 0x2d, 0xee, 0x77, 0x08, 0x92, 0x4f, 0x34, 0x18, - 0x17, 0xa5, 0xb6, 0xd4, 0xdf, 0x4f, 0xa8, 0xbe, 0x4e, 0x0f, 0xb0, 0x40, 0x06, 0xeb, 0x92, 0xc1, - 0xbf, 0xc8, 0xb5, 0xc1, 0x0c, 0x64, 0x1d, 0x45, 0xc4, 0xcf, 0x93, 0x4e, 0x5d, 0xb5, 0x21, 0x2d, - 0x4b, 0x2a, 0xd9, 0x5b, 0xa7, 0x9c, 0xe8, 0x20, 0x13, 0x64, 0x74, 0x5e, 0x32, 0x3a, 0x43, 0xe8, - 0xa1, 0x8c, 0x38, 0xf9, 0x42, 0x8b, 0x0e, 0x33, 0xcb, 0x87, 0xdd, 0xa4, 0xfc, 0x90, 0x43, 0xea, - 0xf3, 0x91, 0xa7, 0x65, 0x49, 0x68, 0x85, 0x9c, 0x1f, 0xfa, 0xc2, 0xe5, 0x1b, 0x9b, 0x2f, 0xdf, - 0x14, 0xb5, 0x57, 0x6f, 0x8a, 0xda, 0xaf, 0x6f, 0x8a, 0xda, 0x67, 0x6f, 0x8b, 0x63, 0xaf, 0xde, - 0x16, 0xc7, 0x7e, 0x7c, 0x5b, 0x1c, 0xfb, 0x50, 0x0f, 0x4d, 0x32, 0x71, 0xbc, 0x47, 0xb1, 0x7f, - 0x5b, 0xd7, 0x26, 0xe5, 0xbf, 0x9f, 0x2f, 0xfd, 0x1e, 0x00, 0x00, 0xff, 0xff, 0x02, 0xb6, 0x58, - 0x43, 0xe8, 0x17, 0x00, 0x00, + // 1638 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdf, 0x6f, 0x13, 0xc7, + 0x16, 0xce, 0xda, 0x4e, 0xec, 0x1c, 0x87, 0x40, 0xe6, 0xe6, 0x0a, 0xc7, 0xe1, 0x3a, 0x61, 0x2e, + 0x97, 0x1b, 0x20, 0xf1, 0x12, 0x43, 0x11, 0xb4, 0x15, 0x52, 0xc2, 0x0f, 0x29, 0x6a, 0xd4, 0x52, + 0x43, 0x44, 0xd5, 0x17, 0x6b, 0x6d, 0x4f, 0x9c, 0x55, 0xec, 0xdd, 0x65, 0x67, 0x43, 0xb0, 0x28, + 0x0f, 0xf4, 0x11, 0xa9, 0x55, 0x25, 0xa4, 0xf6, 0xad, 0x2f, 0x7d, 0xa3, 0x52, 0x9f, 0xfa, 0x47, + 0xd0, 0x37, 0xd4, 0xbe, 0x54, 0x55, 0x45, 0x2b, 0xe8, 0x1f, 0x52, 0xcd, 0xcc, 0x59, 0x7b, 0xd7, + 0xeb, 0x75, 0x8c, 0x43, 0x9f, 0xe2, 0xdd, 0x39, 0xe7, 0x3b, 0xdf, 0x39, 0x73, 0xce, 0xec, 0x7c, + 0x81, 0x79, 0xd6, 0x6c, 0x73, 0xbd, 0x65, 0x70, 0x8f, 0xb9, 0xb5, 0x1d, 0xb6, 0xad, 0xdf, 0xdb, + 0x63, 0x6e, 0xbb, 0xe8, 0xb8, 0xb6, 0x67, 0x93, 0xa3, 0x62, 0xb1, 0xd8, 0x5d, 0xcc, 0xcf, 0x36, + 0xec, 0x86, 0x2d, 0xd7, 0x74, 0xf1, 0x4b, 0x99, 0xe5, 0x4f, 0x34, 0x6c, 0xbb, 0xd1, 0x64, 0xba, + 0xe1, 0x98, 0xba, 0x61, 0x59, 0xb6, 0x67, 0x78, 0xa6, 0x6d, 0x71, 0x5c, 0x3d, 0x5b, 0xb3, 0x79, + 0xcb, 0xe6, 0x7a, 0xd5, 0xe0, 0x4c, 0xa1, 0xeb, 0xf7, 0x57, 0xab, 0xcc, 0x33, 0x56, 0x75, 0xc7, + 0x68, 0x98, 0x96, 0x34, 0x46, 0xdb, 0x42, 0xd0, 0xd6, 0xb7, 0xaa, 0xd9, 0xa6, 0xbf, 0x7e, 0xa2, + 0x97, 0xad, 0x63, 0xb8, 0x46, 0xcb, 0x8f, 0xb4, 0xd4, 0xbb, 0xca, 0x1e, 0x78, 0xcc, 0xb5, 0x8c, + 0x66, 0xc5, 0xb4, 0x6a, 0xcc, 0xf2, 0xcc, 0xfb, 0x0c, 0x2d, 0xf3, 0x11, 0x1c, 0xdb, 0x6e, 0xe2, + 0x5a, 0xa4, 0x22, 0x5e, 0xdb, 0x61, 0x3c, 0x44, 0xa0, 0x66, 0xb7, 0x5a, 0xa6, 0xd7, 0x62, 0x96, + 0x17, 0x26, 0x30, 0xa7, 0xe8, 0x57, 0x54, 0x85, 0xd4, 0x83, 0x5a, 0xa2, 0xb3, 0x40, 0x3e, 0x16, + 0xb9, 0xdf, 0x92, 0xf6, 0x65, 0x76, 0x6f, 0x8f, 0x71, 0x8f, 0x6e, 0xc2, 0xbf, 0x42, 0x6f, 0xb9, + 0x63, 0x5b, 0x9c, 0x91, 0x77, 0x60, 0x42, 0xe1, 0xe6, 0xb4, 0x45, 0x6d, 0x29, 0x5b, 0x3a, 0x5e, + 0xec, 0xd9, 0x88, 0xa2, 0x72, 0x58, 0x4f, 0x3d, 0x7f, 0xb9, 0x30, 0x56, 0x46, 0x63, 0xaa, 0xc3, + 0x7f, 0x24, 0xda, 0x0d, 0x4c, 0x7b, 0xc3, 0xcf, 0x1a, 0xc3, 0x91, 0x69, 0x48, 0x98, 0x75, 0x89, + 0x99, 0x2a, 0x27, 0xcc, 0x3a, 0x6d, 0x43, 0x21, 0xce, 0x01, 0x99, 0xdc, 0x05, 0x12, 0x2d, 0x22, + 0xb2, 0xa2, 0x11, 0x56, 0x11, 0x1c, 0x24, 0x38, 0xc3, 0x7a, 0x17, 0xa8, 0x0e, 0xb3, 0x2a, 0x73, + 0xdb, 0x6e, 0x6e, 0x58, 0xdb, 0xb6, 0x4f, 0xf1, 0x38, 0xa4, 0xc5, 0x5e, 0x54, 0x3a, 0x3c, 0x27, + 0xc4, 0xe3, 0x46, 0x9d, 0x6e, 0xc1, 0xbf, 0x7b, 0x1c, 0x90, 0xe2, 0xfb, 0x30, 0xa9, 0x3c, 0xac, + 0x6d, 0x1b, 0x99, 0xcd, 0x45, 0xeb, 0x85, 0x5e, 0x48, 0x28, 0xe3, 0xe0, 0x33, 0xfd, 0x04, 0xf2, + 0x1d, 0xd8, 0x32, 0xdb, 0x37, 0xdc, 0xfa, 0x30, 0x6c, 0xc8, 0x49, 0x98, 0x72, 0xa5, 0x75, 0xa5, + 0xce, 0x2c, 0xbb, 0x95, 0x4b, 0x2c, 0x6a, 0x4b, 0x93, 0xe5, 0xac, 0x7a, 0x77, 0x5d, 0xbc, 0xa2, + 0x16, 0xcc, 0xf7, 0x45, 0x46, 0xda, 0x1f, 0xc1, 0x31, 0x09, 0x8d, 0x30, 0x01, 0xf6, 0x0b, 0x7d, + 0xd9, 0x77, 0x21, 0x30, 0x87, 0x69, 0x27, 0xf4, 0x96, 0x36, 0x31, 0x93, 0x2d, 0xce, 0xdc, 0x68, + 0x26, 0x04, 0x52, 0x7b, 0x9c, 0xb9, 0x32, 0xc4, 0x64, 0x59, 0xfe, 0x0e, 0x66, 0x97, 0x18, 0x98, + 0x5d, 0x32, 0x3e, 0xbb, 0xde, 0x68, 0xdd, 0xec, 0x44, 0x88, 0xa1, 0xb2, 0x0b, 0x43, 0xf8, 0xd9, + 0xed, 0x85, 0xde, 0xd2, 0x0b, 0xd8, 0xdb, 0xc2, 0xf8, 0x16, 0xb3, 0xea, 0xa6, 0xd5, 0x50, 0xab, + 0x03, 0x12, 0xa4, 0x4f, 0x34, 0x80, 0x2e, 0x46, 0xfc, 0x6e, 0xd6, 0x60, 0x42, 0x11, 0xcd, 0x25, + 0x16, 0x93, 0xb2, 0x7f, 0x70, 0x76, 0xc5, 0x39, 0x54, 0xc4, 0x73, 0xa8, 0x78, 0xcd, 0x36, 0xad, + 0xf5, 0xf3, 0x82, 0xdd, 0xb3, 0x3f, 0x16, 0x96, 0x1a, 0xa6, 0xb7, 0xb3, 0x57, 0x2d, 0xd6, 0xec, + 0x16, 0x0e, 0x3a, 0xfe, 0x59, 0xe1, 0xf5, 0x5d, 0x3c, 0x32, 0x84, 0x03, 0x2f, 0x23, 0x34, 0xfd, + 0x49, 0xc3, 0x69, 0xeb, 0x93, 0x42, 0x67, 0xee, 0xd3, 0xca, 0x58, 0x0c, 0xbe, 0x20, 0x32, 0x1f, + 0x29, 0x56, 0xa0, 0xd6, 0xbe, 0x2d, 0x71, 0xe0, 0x88, 0x67, 0x7b, 0x86, 0xdf, 0x4b, 0xfc, 0x9f, + 0xc8, 0x62, 0x4a, 0x46, 0x50, 0xd1, 0x39, 0x2d, 0x61, 0xaf, 0xdd, 0xf6, 0x8c, 0x6a, 0x93, 0xdd, + 0xf6, 0x8c, 0x5d, 0xb6, 0xe6, 0xb8, 0xfe, 0x56, 0xcc, 0xc2, 0xb8, 0xea, 0x1b, 0xb5, 0x17, 0xea, + 0x81, 0x56, 0xb1, 0x63, 0x7a, 0x7d, 0x30, 0xf7, 0x6b, 0x90, 0x34, 0x1c, 0xdc, 0xbe, 0xf5, 0x55, + 0xc1, 0xef, 0xb7, 0x97, 0x0b, 0xf3, 0x8a, 0x0d, 0xaf, 0xef, 0x16, 0x4d, 0x5b, 0x6f, 0x19, 0xde, + 0x4e, 0x71, 0x93, 0x35, 0x8c, 0x5a, 0xfb, 0x3a, 0xab, 0xfd, 0xfc, 0xe3, 0x0a, 0x60, 0x82, 0xd7, + 0x59, 0xad, 0x2c, 0xbc, 0xe9, 0x6a, 0xe0, 0x54, 0x59, 0x73, 0x5c, 0xff, 0x9c, 0x25, 0x73, 0x90, + 0xc1, 0x9d, 0x57, 0x95, 0x4d, 0x95, 0xd3, 0x6a, 0xeb, 0x39, 0xfd, 0x20, 0x70, 0xae, 0x28, 0x17, + 0x24, 0x54, 0x82, 0x54, 0xdd, 0xf0, 0x0c, 0xdc, 0x89, 0x5c, 0xdf, 0xa1, 0x5c, 0x73, 0x5c, 0xec, + 0x57, 0x69, 0x4b, 0xbf, 0x4c, 0x40, 0x1a, 0xdf, 0xc7, 0x77, 0xdb, 0x26, 0x64, 0x58, 0x9d, 0x59, + 0x15, 0x91, 0x6e, 0x62, 0xd4, 0x74, 0xd3, 0x02, 0x42, 0x84, 0xd9, 0x84, 0xcc, 0x1e, 0xaf, 0xd7, + 0x24, 0x5a, 0x72, 0x64, 0x34, 0x01, 0x21, 0xd0, 0x3e, 0x84, 0x49, 0xd5, 0x4a, 0x02, 0x2e, 0x35, + 0x2a, 0x5c, 0x46, 0x62, 0xac, 0x39, 0x2e, 0x5d, 0x81, 0xe3, 0x6a, 0xd3, 0x77, 0xec, 0xfd, 0x9b, + 0x8c, 0xf5, 0x9c, 0x48, 0x75, 0xc3, 0x63, 0xfe, 0xc0, 0x8a, 0xdf, 0x74, 0x0b, 0x72, 0x51, 0x73, + 0xdc, 0x8f, 0x2b, 0x90, 0xd9, 0x66, 0x2c, 0x78, 0x94, 0x44, 0xf7, 0x04, 0x7d, 0x70, 0x4f, 0xd2, + 0xdb, 0xea, 0x91, 0xce, 0x21, 0x8b, 0x4d, 0x93, 0x7b, 0x61, 0x16, 0x9d, 0x88, 0xa1, 0xa5, 0xbe, + 0x11, 0x93, 0x6f, 0x12, 0xb1, 0x01, 0x47, 0x25, 0x6c, 0x60, 0x2a, 0xae, 0xc2, 0x91, 0x7d, 0xd3, + 0xdb, 0xa9, 0xbb, 0xc6, 0x7e, 0x45, 0x4c, 0x96, 0x4c, 0x62, 0xda, 0xff, 0x56, 0x75, 0xaf, 0x14, + 0xc5, 0x1b, 0x86, 0x6b, 0xdd, 0x69, 0x3b, 0xac, 0x3c, 0xe5, 0xdb, 0x8b, 0xa7, 0xee, 0x54, 0x25, + 0x82, 0x53, 0x75, 0x17, 0x8e, 0x75, 0x03, 0xbd, 0xcd, 0x51, 0x22, 0x5d, 0xe0, 0xce, 0x75, 0xe5, + 0x71, 0x1a, 0x66, 0x02, 0x2f, 0x31, 0xdc, 0x16, 0x1c, 0xf1, 0x3b, 0xb0, 0x22, 0x7e, 0x8c, 0x1e, + 0x38, 0x8b, 0x6d, 0xb8, 0xc5, 0xeb, 0x35, 0x01, 0xeb, 0x8f, 0x89, 0x82, 0x1d, 0x79, 0x56, 0xb2, + 0x38, 0x2b, 0x12, 0xf6, 0x2e, 0x4c, 0x77, 0xd8, 0x8a, 0xf7, 0xd5, 0xd1, 0xa7, 0x66, 0x0a, 0xe9, + 0xde, 0x10, 0x30, 0x02, 0xb8, 0xc3, 0x57, 0x01, 0x8f, 0x3c, 0x3f, 0x53, 0x48, 0x58, 0x01, 0x07, + 0xeb, 0x2b, 0x16, 0x72, 0xe3, 0x87, 0xad, 0xaf, 0xc0, 0x0d, 0xd5, 0x57, 0xc2, 0x4e, 0x1c, 0xb6, + 0xbe, 0x12, 0x16, 0xcb, 0x50, 0xed, 0xe2, 0xa6, 0x0f, 0x55, 0x86, 0x6a, 0x80, 0x6f, 0xb7, 0x0c, + 0xcd, 0x36, 0xcf, 0x65, 0x0e, 0x5d, 0x86, 0x66, 0x9b, 0x87, 0xcb, 0x20, 0x60, 0x27, 0x0f, 0x5d, + 0x06, 0x01, 0x1b, 0x2e, 0x83, 0xc0, 0x85, 0xc3, 0x97, 0xa1, 0xd9, 0xe6, 0xf4, 0x33, 0x3c, 0xcb, + 0xba, 0x77, 0xc2, 0x21, 0xbe, 0x72, 0xe4, 0x26, 0x40, 0x57, 0x6c, 0xc9, 0x49, 0xca, 0x96, 0x4e, + 0x87, 0xee, 0x07, 0x4a, 0xf7, 0xf9, 0xb7, 0x84, 0x5b, 0x46, 0xc3, 0x57, 0x0d, 0xe5, 0x80, 0x27, + 0x7d, 0x9a, 0x84, 0x6c, 0x20, 0x72, 0xfc, 0x47, 0xae, 0x0c, 0x78, 0x5d, 0xe4, 0x62, 0x78, 0x47, + 0x9f, 0x5d, 0x40, 0x94, 0x2d, 0x5e, 0x27, 0x56, 0xe7, 0x5a, 0x2a, 0x24, 0x21, 0xcf, 0x25, 0xdf, + 0xfe, 0x35, 0x07, 0x49, 0xcb, 0x07, 0xb2, 0x0e, 0xb2, 0xf4, 0x95, 0x6d, 0xdb, 0x95, 0x97, 0xc3, + 0x14, 0x8a, 0x8b, 0xd8, 0x78, 0xea, 0x23, 0x20, 0xfb, 0xe0, 0xa6, 0xf2, 0x21, 0x35, 0x98, 0xed, + 0x08, 0x28, 0xbf, 0x20, 0xe2, 0x70, 0x1e, 0x79, 0x86, 0x3b, 0x7a, 0x0c, 0xb7, 0x40, 0x7c, 0x65, + 0xef, 0xe0, 0x47, 0x2c, 0xd4, 0x13, 0x78, 0x3a, 0x5f, 0x86, 0x71, 0xb1, 0x25, 0xfe, 0x8d, 0xf2, + 0xc4, 0x00, 0x71, 0xe1, 0xeb, 0x49, 0xe5, 0x50, 0xfa, 0xfd, 0x28, 0x8c, 0x4b, 0x58, 0xf2, 0x58, + 0x83, 0x09, 0xa5, 0x38, 0xc9, 0x7f, 0x23, 0xfe, 0x51, 0x59, 0x9b, 0x3f, 0x35, 0xd8, 0x48, 0x31, + 0xa3, 0xcb, 0x9f, 0xff, 0xf2, 0xd7, 0xd3, 0xc4, 0x69, 0x72, 0x4a, 0x17, 0xd6, 0x2b, 0x16, 0xf3, + 0xf6, 0x6d, 0x77, 0x57, 0xef, 0x2f, 0xf1, 0xc9, 0x0f, 0x1a, 0xcc, 0x44, 0xf4, 0x25, 0x29, 0xf6, + 0x8f, 0x14, 0xa7, 0x80, 0xf3, 0xfa, 0xd0, 0xf6, 0x48, 0xf2, 0xb2, 0x24, 0x59, 0x22, 0xe7, 0x07, + 0x93, 0x8c, 0x8a, 0x64, 0xf2, 0x44, 0x83, 0x8c, 0x2f, 0x3b, 0xc9, 0xff, 0x62, 0x2a, 0x12, 0x56, + 0xbf, 0xf9, 0xd3, 0x07, 0x99, 0x21, 0x2b, 0x5d, 0xb2, 0x3a, 0x43, 0xfe, 0x7f, 0x40, 0xe9, 0x7c, + 0x5d, 0x4c, 0xbe, 0xd3, 0x60, 0x3a, 0xac, 0x22, 0xc9, 0xb9, 0xf8, 0x58, 0x11, 0xf9, 0x98, 0x5f, + 0x1e, 0xce, 0x18, 0xe9, 0x5d, 0x92, 0xf4, 0xce, 0x93, 0xe2, 0x10, 0xf4, 0x02, 0x0a, 0x51, 0xb2, + 0x0c, 0xab, 0xc1, 0x38, 0x96, 0x7d, 0x45, 0x6e, 0x1c, 0xcb, 0xfe, 0x1a, 0x75, 0x58, 0x96, 0xbd, + 0x3a, 0x96, 0x3c, 0xd3, 0x60, 0x26, 0xa2, 0xe1, 0xe2, 0x3a, 0x31, 0x4e, 0xaf, 0xc6, 0x75, 0x62, + 0xac, 0x38, 0xa4, 0x17, 0x25, 0xdd, 0x22, 0x59, 0x3e, 0xa0, 0xa8, 0xca, 0x19, 0x19, 0x93, 0xef, + 0x35, 0x98, 0x0e, 0x2b, 0xae, 0xb8, 0x92, 0xf6, 0xd5, 0x72, 0x71, 0x25, 0xed, 0x2f, 0xe2, 0xe8, + 0x55, 0xc9, 0xf1, 0x32, 0xb9, 0x34, 0x98, 0x23, 0x97, 0xde, 0x15, 0x2e, 0xdc, 0xc5, 0x69, 0xa8, + 0x3f, 0x94, 0x97, 0xd9, 0x47, 0x9d, 0x99, 0x11, 0xf7, 0xcb, 0x41, 0x33, 0x13, 0xb8, 0x94, 0x0e, + 0x9a, 0x99, 0xe0, 0x35, 0xf5, 0x8d, 0x66, 0xc6, 0x10, 0xf1, 0xbf, 0xd5, 0x20, 0x1b, 0x10, 0x22, + 0x64, 0x29, 0xa6, 0x14, 0x11, 0x69, 0x93, 0x3f, 0x33, 0x84, 0x25, 0xb2, 0x7a, 0x57, 0xb2, 0xba, + 0x48, 0x4a, 0x07, 0x54, 0x6c, 0xc7, 0xde, 0xaf, 0xf8, 0x62, 0x44, 0x7f, 0x28, 0xc4, 0xd2, 0x23, + 0xf2, 0x8d, 0x06, 0xd9, 0x80, 0x6e, 0x89, 0x23, 0x18, 0x55, 0x3d, 0x71, 0x04, 0xfb, 0x88, 0x20, + 0x7a, 0x41, 0x12, 0x5c, 0x21, 0xe7, 0x06, 0x13, 0x6c, 0x9a, 0xdc, 0xeb, 0x10, 0x24, 0x5f, 0x68, + 0x90, 0x14, 0xad, 0xb6, 0xd8, 0x3f, 0x4e, 0xa0, 0xbf, 0x4e, 0x0e, 0xb0, 0x40, 0x06, 0x6b, 0x92, + 0xc1, 0x7b, 0xe4, 0xca, 0x60, 0x06, 0xb2, 0x8f, 0x42, 0x0a, 0xeb, 0x51, 0xa7, 0xaf, 0xda, 0x90, + 0x92, 0x2d, 0x15, 0x1f, 0xad, 0xd3, 0x4e, 0x74, 0x90, 0x09, 0x32, 0x3a, 0x2b, 0x19, 0x9d, 0x22, + 0xf4, 0x40, 0x46, 0x9c, 0x7c, 0xad, 0x85, 0x6f, 0x4c, 0x4b, 0x07, 0x9d, 0xa4, 0xfc, 0x80, 0x4d, + 0xea, 0xf3, 0x91, 0xa7, 0x25, 0x49, 0x68, 0x99, 0x9c, 0x1d, 0xfa, 0xc0, 0xe5, 0xeb, 0x1b, 0xcf, + 0x5f, 0x15, 0xb4, 0x17, 0xaf, 0x0a, 0xda, 0x9f, 0xaf, 0x0a, 0xda, 0x57, 0xaf, 0x0b, 0x63, 0x2f, + 0x5e, 0x17, 0xc6, 0x7e, 0x7d, 0x5d, 0x18, 0xfb, 0x54, 0x0f, 0x5c, 0x97, 0xa2, 0x78, 0x0f, 0x22, + 0xff, 0x1b, 0xaf, 0x4e, 0xc8, 0xff, 0x71, 0x5f, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x79, 0x8b, + 0xc4, 0xb9, 0x4d, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3071,6 +3073,16 @@ func (m *PoolRewards) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + { + size := m.ExternalRewardsApr.Size() + i -= size + if _, err := m.ExternalRewardsApr.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a { size, err := m.EdenForward.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -3562,6 +3574,8 @@ func (m *PoolRewards) Size() (n int) { } l = m.EdenForward.Size() n += 1 + l + sovQuery(uint64(l)) + l = m.ExternalRewardsApr.Size() + n += 1 + l + sovQuery(uint64(l)) return n } @@ -6508,6 +6522,40 @@ func (m *PoolRewards) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExternalRewardsApr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ExternalRewardsApr.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:])