diff --git a/proto/elys/incentive/query.proto b/proto/elys/incentive/query.proto index 2220a5b7b..49fecbc15 100644 --- a/proto/elys/incentive/query.proto +++ b/proto/elys/incentive/query.proto @@ -102,6 +102,9 @@ message PoolRewards { (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; + cosmos.base.v1beta1.Coin eden_forward = 4 [ + (gogoproto.nullable) = false + ]; } message QueryPoolRewardsResponse { diff --git a/x/incentive/keeper/queries.go b/x/incentive/keeper/queries.go index 7932004a9..ff378c487 100644 --- a/x/incentive/keeper/queries.go +++ b/x/incentive/keeper/queries.go @@ -162,10 +162,12 @@ func (k Keeper) PoolRewards(goCtx context.Context, req *types.QueryPoolRewardsRe func (k *Keeper) generatePoolRewards(ctx sdk.Context, ammPool *ammtypes.Pool) types.PoolRewards { // Get rewards amount rewardsUsd, rewardCoins := k.GetDailyRewardsAmountForPool(ctx, ammPool.PoolId) + edenForward := sdk.NewCoin(ptypes.Eden, k.masterchef.ForwardEdenCalc(ctx, ammPool.PoolId).RoundInt()) return types.PoolRewards{ PoolId: ammPool.PoolId, RewardsUsd: rewardsUsd, RewardCoins: rewardCoins, + EdenForward: edenForward, } } diff --git a/x/incentive/types/query.pb.go b/x/incentive/types/query.pb.go index ceb32f7df..b57280ed1 100644 --- a/x/incentive/types/query.pb.go +++ b/x/incentive/types/query.pb.go @@ -261,6 +261,7 @@ type PoolRewards struct { PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty"` RewardsUsd github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=rewards_usd,json=rewardsUsd,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" 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 types1.Coin `protobuf:"bytes,4,opt,name=eden_forward,json=edenForward,proto3" json:"eden_forward"` } func (m *PoolRewards) Reset() { *m = PoolRewards{} } @@ -310,6 +311,13 @@ func (m *PoolRewards) GetRewardCoins() github_com_cosmos_cosmos_sdk_types.Coins return nil } +func (m *PoolRewards) GetEdenForward() types1.Coin { + if m != nil { + return m.EdenForward + } + return types1.Coin{} +} + type QueryPoolRewardsResponse struct { Pools []PoolRewards `protobuf:"bytes,1,rep,name=pools,proto3" json:"pools"` } @@ -367,57 +375,58 @@ func init() { func init() { proto.RegisterFile("elys/incentive/query.proto", fileDescriptor_29b04b3fcad26af2) } var fileDescriptor_29b04b3fcad26af2 = []byte{ - // 794 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcf, 0x4f, 0xdb, 0x48, - 0x14, 0xc7, 0x63, 0xf2, 0x03, 0x98, 0x00, 0xbb, 0x3b, 0x42, 0xc2, 0xc9, 0xae, 0x92, 0xe0, 0x95, - 0xd8, 0xb0, 0x2b, 0xec, 0x25, 0x7b, 0xd8, 0xd5, 0x1e, 0x2a, 0x48, 0x4b, 0xd5, 0x9e, 0x4a, 0x5d, - 0xb8, 0xf4, 0x12, 0x4d, 0xe2, 0x91, 0xb1, 0x48, 0x66, 0x8c, 0xc7, 0x21, 0x8d, 0x28, 0x97, 0x1e, - 0x7b, 0xaa, 0xc4, 0x7f, 0xd0, 0x63, 0xff, 0x12, 0x8e, 0x48, 0xbd, 0x54, 0x3d, 0xd0, 0x8a, 0x54, - 0xea, 0xbf, 0x51, 0xbd, 0xf1, 0x24, 0x71, 0x42, 0x81, 0x2a, 0x39, 0xd9, 0x33, 0xf3, 0xde, 0xe7, - 0x7d, 0xdf, 0xd3, 0x9b, 0x37, 0x28, 0x4f, 0x9b, 0x5d, 0x61, 0x79, 0xac, 0x41, 0x59, 0xe8, 0x1d, - 0x53, 0xeb, 0xa8, 0x4d, 0x83, 0xae, 0xe9, 0x07, 0x3c, 0xe4, 0x78, 0x09, 0xce, 0xcc, 0xc1, 0x59, - 0x3e, 0xd7, 0xe0, 0xa2, 0xc5, 0x45, 0x4d, 0x9e, 0x5a, 0xd1, 0x22, 0x32, 0xcd, 0x2f, 0xbb, 0xdc, - 0xe5, 0xd1, 0x3e, 0xfc, 0xa9, 0xdd, 0xdf, 0x5c, 0xce, 0xdd, 0x26, 0xb5, 0x88, 0xef, 0x59, 0x84, - 0x31, 0x1e, 0x92, 0xd0, 0xe3, 0xac, 0xef, 0x53, 0x88, 0x08, 0x56, 0x9d, 0x08, 0x6a, 0x1d, 0x6f, - 0xd6, 0x69, 0x48, 0x36, 0xad, 0x06, 0xf7, 0x98, 0x3a, 0xff, 0x33, 0x7e, 0x2e, 0x75, 0x0d, 0xac, - 0x7c, 0xe2, 0x7a, 0x4c, 0xc2, 0xfa, 0x91, 0x64, 0x1a, 0x0d, 0xde, 0x6a, 0x79, 0x61, 0x8b, 0xb2, - 0xd0, 0xf2, 0x49, 0x40, 0x5a, 0x2a, 0x92, 0xe1, 0xa2, 0x9f, 0x9e, 0x82, 0xff, 0xb6, 0x1f, 0xd8, - 0xf4, 0xa8, 0x4d, 0x45, 0x88, 0xef, 0xa1, 0xc5, 0x8e, 0x17, 0x1e, 0x38, 0x01, 0xe9, 0xd4, 0xc2, - 0xae, 0x4f, 0x75, 0xad, 0xa4, 0x95, 0x97, 0x2a, 0x39, 0x53, 0xe6, 0x3c, 0x04, 0x99, 0x3b, 0x24, - 0x60, 0x7b, 0x5d, 0x9f, 0xda, 0x0b, 0x7d, 0x7b, 0x58, 0xe1, 0x65, 0x94, 0x76, 0x28, 0xe3, 0x2d, - 0x7d, 0xa6, 0xa4, 0x95, 0xe7, 0xed, 0x68, 0x61, 0xec, 0xa1, 0x9f, 0x87, 0x81, 0x84, 0xcf, 0x99, - 0xa0, 0x78, 0x0b, 0x25, 0x89, 0x1f, 0x48, 0xfe, 0x7c, 0xd5, 0x3c, 0xbf, 0x2c, 0x26, 0x3e, 0x5e, - 0x16, 0xd7, 0x5c, 0x2f, 0x3c, 0x68, 0xd7, 0x21, 0x90, 0x2a, 0xa4, 0xfa, 0x6c, 0x08, 0xe7, 0xd0, - 0x02, 0x41, 0xc2, 0x7c, 0x40, 0x1b, 0x36, 0xb8, 0x1a, 0x78, 0x48, 0x15, 0x4a, 0xbf, 0xd1, 0xcb, - 0xa0, 0x5f, 0x62, 0x9b, 0x2a, 0x96, 0x8d, 0x16, 0xdb, 0xc2, 0x69, 0xd4, 0x88, 0x1f, 0xd4, 0xe0, - 0x67, 0xc2, 0xa8, 0x59, 0xf0, 0xdd, 0xf6, 0x83, 0x7d, 0xe1, 0x34, 0x80, 0x49, 0x1d, 0xca, 0x86, - 0xcc, 0x99, 0xc9, 0x98, 0x00, 0xe9, 0x33, 0xf7, 0xd0, 0xd2, 0x40, 0x27, 0xec, 0xd7, 0xf5, 0xe4, - 0x44, 0xd0, 0x05, 0x25, 0x74, 0x07, 0x18, 0x40, 0x1d, 0x28, 0x8d, 0xa8, 0xa9, 0xc9, 0xa8, 0x4a, - 0x6a, 0x44, 0x8d, 0xd7, 0x14, 0x0e, 0xf4, 0xf4, 0x54, 0x35, 0x05, 0xe8, 0x48, 0x4d, 0x25, 0x33, - 0x33, 0x55, 0x4d, 0x25, 0x53, 0x65, 0x5f, 0x1f, 0x42, 0x67, 0x27, 0xcf, 0xbe, 0x1e, 0x53, 0x3a, - 0xcc, 0xbe, 0xd9, 0x15, 0xfa, 0xdc, 0x74, 0xd9, 0x37, 0xbb, 0x62, 0x34, 0x7b, 0x60, 0xce, 0x4f, - 0x97, 0x3d, 0x30, 0x47, 0xb3, 0x07, 0x28, 0x9a, 0x32, 0xfb, 0x66, 0x57, 0x18, 0x2f, 0xd1, 0x8a, - 0xbc, 0x64, 0xbb, 0x9c, 0x37, 0x6d, 0xda, 0x21, 0x81, 0xd3, 0xbf, 0x80, 0x38, 0x87, 0xe6, 0x7c, - 0xce, 0x9b, 0x35, 0xcf, 0x11, 0xba, 0x56, 0x4a, 0x96, 0x53, 0xf6, 0x2c, 0xac, 0x1f, 0x3b, 0x02, - 0x3f, 0x44, 0x68, 0x38, 0xa0, 0xe4, 0x75, 0xc9, 0x56, 0xd6, 0x4c, 0x35, 0x2f, 0x61, 0x9a, 0x99, - 0xd1, 0x94, 0x55, 0xd3, 0xcc, 0xdc, 0x25, 0x2e, 0x55, 0x58, 0x3b, 0xe6, 0x69, 0x7c, 0xd5, 0x50, - 0x36, 0x16, 0x19, 0xaf, 0xa0, 0x59, 0x15, 0x52, 0xde, 0xeb, 0x94, 0x9d, 0x89, 0x22, 0xe2, 0x27, - 0x28, 0x1b, 0x44, 0x36, 0x70, 0x43, 0x27, 0xbc, 0xa0, 0x48, 0x21, 0xf6, 0x85, 0x83, 0x19, 0x5a, - 0x88, 0x56, 0x35, 0x98, 0xc7, 0x42, 0x4f, 0x96, 0x92, 0xe5, 0x6c, 0x25, 0x37, 0x92, 0x43, 0x5f, - 0xfd, 0x7d, 0xee, 0xb1, 0xea, 0xdf, 0x10, 0xec, 0xdd, 0xa7, 0x62, 0xf9, 0x07, 0x82, 0x81, 0x83, - 0xb0, 0x95, 0x62, 0xb9, 0x30, 0x9e, 0x21, 0xfd, 0x7a, 0x9d, 0xd5, 0x4c, 0xfb, 0x17, 0xa5, 0x21, - 0xcd, 0xa8, 0xca, 0xd9, 0xca, 0xaf, 0xe6, 0xe8, 0xab, 0x64, 0xc6, 0x7c, 0xaa, 0x29, 0x90, 0x61, - 0x47, 0xf6, 0x95, 0xb7, 0x49, 0x94, 0x96, 0x54, 0xfc, 0x5a, 0x43, 0xc9, 0x6d, 0x3f, 0xc0, 0xc5, - 0x71, 0xdf, 0xb1, 0x57, 0x21, 0x5f, 0xba, 0xd9, 0x20, 0x52, 0x63, 0x6c, 0xbd, 0x7a, 0xff, 0xe5, - 0x6c, 0xe6, 0x7f, 0xfc, 0x9f, 0x05, 0x96, 0x1b, 0x8c, 0x86, 0x1d, 0x1e, 0x1c, 0x5a, 0x63, 0xaf, - 0x28, 0xf1, 0x03, 0xeb, 0x64, 0xe4, 0x7d, 0x39, 0xb5, 0x4e, 0xe4, 0x13, 0x71, 0x8a, 0x8f, 0x51, - 0x0a, 0x66, 0x36, 0xbe, 0x31, 0x56, 0xbf, 0xc5, 0xf2, 0xab, 0xb7, 0x58, 0x28, 0x39, 0xeb, 0x52, - 0xce, 0xef, 0x78, 0xf5, 0x2e, 0x39, 0x02, 0x9f, 0x8d, 0x75, 0xd3, 0x1f, 0xdf, 0xa5, 0x5f, 0xef, - 0xf4, 0x7c, 0xf9, 0x6e, 0x43, 0xa5, 0x66, 0x53, 0xaa, 0xf9, 0x0b, 0xaf, 0xdf, 0xaa, 0x46, 0xf6, - 0xb0, 0x6a, 0xb6, 0xea, 0xa3, 0xf3, 0xab, 0x82, 0x76, 0x71, 0x55, 0xd0, 0x3e, 0x5f, 0x15, 0xb4, - 0x37, 0xbd, 0x42, 0xe2, 0xa2, 0x57, 0x48, 0x7c, 0xe8, 0x15, 0x12, 0xcf, 0xcd, 0x58, 0x2b, 0x5d, - 0xc7, 0xbd, 0x88, 0x01, 0x65, 0x5b, 0xd5, 0x33, 0xf2, 0xad, 0xff, 0xe7, 0x5b, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xb6, 0x96, 0x8a, 0x1c, 0xd2, 0x08, 0x00, 0x00, + // 810 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x4f, 0x4f, 0x13, 0x4f, + 0x18, 0xc7, 0xbb, 0xfd, 0x07, 0x4c, 0x81, 0xdf, 0xcf, 0x09, 0x09, 0xdb, 0x6a, 0xda, 0xb2, 0x26, + 0x58, 0x34, 0xec, 0x4a, 0x3d, 0x68, 0x3c, 0x18, 0xa8, 0x42, 0xf4, 0x24, 0xae, 0x70, 0xf1, 0xd2, + 0x6c, 0xbb, 0xe3, 0xb2, 0xa1, 0xdd, 0x59, 0x76, 0xb6, 0xd4, 0x06, 0xb9, 0x78, 0xf4, 0x64, 0xc2, + 0x3b, 0xf0, 0xa8, 0x6f, 0x84, 0x23, 0x89, 0x17, 0xe3, 0x01, 0x0d, 0xf5, 0x85, 0x98, 0x67, 0x66, + 0xda, 0x6e, 0x41, 0xc0, 0xb4, 0x27, 0x3a, 0x33, 0xcf, 0xf3, 0x79, 0xbe, 0xcf, 0xb3, 0xf3, 0x3c, + 0x03, 0xca, 0x91, 0x46, 0x87, 0x19, 0xae, 0x57, 0x27, 0x5e, 0xe8, 0xee, 0x13, 0x63, 0xaf, 0x45, + 0x82, 0x8e, 0xee, 0x07, 0x34, 0xa4, 0x78, 0x16, 0xce, 0xf4, 0xfe, 0x59, 0x2e, 0x5b, 0xa7, 0xac, + 0x49, 0x59, 0x95, 0x9f, 0x1a, 0x62, 0x21, 0x4c, 0x73, 0x73, 0x0e, 0x75, 0xa8, 0xd8, 0x87, 0x5f, + 0x72, 0xf7, 0x96, 0x43, 0xa9, 0xd3, 0x20, 0x86, 0xe5, 0xbb, 0x86, 0xe5, 0x79, 0x34, 0xb4, 0x42, + 0x97, 0x7a, 0x3d, 0x9f, 0xbc, 0x20, 0x18, 0x35, 0x8b, 0x11, 0x63, 0x7f, 0xa5, 0x46, 0x42, 0x6b, + 0xc5, 0xa8, 0x53, 0xd7, 0x93, 0xe7, 0x77, 0xa3, 0xe7, 0x5c, 0x57, 0xdf, 0xca, 0xb7, 0x1c, 0xd7, + 0xe3, 0xb0, 0x5e, 0x24, 0x9e, 0x46, 0x9d, 0x36, 0x9b, 0x6e, 0xd8, 0x24, 0x5e, 0x68, 0xf8, 0x56, + 0x60, 0x35, 0x65, 0x24, 0xcd, 0x41, 0xff, 0xbd, 0x02, 0xff, 0x35, 0x3f, 0x30, 0xc9, 0x5e, 0x8b, + 0xb0, 0x10, 0x3f, 0x41, 0x33, 0x6d, 0x37, 0xdc, 0xb1, 0x03, 0xab, 0x5d, 0x0d, 0x3b, 0x3e, 0x51, + 0x95, 0xa2, 0x52, 0x9a, 0x2d, 0x67, 0x75, 0x9e, 0xf3, 0x00, 0xa4, 0xaf, 0x5b, 0x81, 0xb7, 0xd5, + 0xf1, 0x89, 0x39, 0xdd, 0xb3, 0x87, 0x15, 0x9e, 0x43, 0x29, 0x9b, 0x78, 0xb4, 0xa9, 0xc6, 0x8b, + 0x4a, 0x69, 0xca, 0x14, 0x0b, 0x6d, 0x0b, 0xfd, 0x3f, 0x08, 0xc4, 0x7c, 0xea, 0x31, 0x82, 0x57, + 0x51, 0xc2, 0xf2, 0x03, 0xce, 0x9f, 0xaa, 0xe8, 0xc7, 0xa7, 0x85, 0xd8, 0x8f, 0xd3, 0xc2, 0xa2, + 0xe3, 0x86, 0x3b, 0xad, 0x1a, 0x04, 0x92, 0x85, 0x94, 0x7f, 0x96, 0x99, 0xbd, 0x6b, 0x80, 0x20, + 0xa6, 0x3f, 0x23, 0x75, 0x13, 0x5c, 0x35, 0x3c, 0xa0, 0x32, 0xa9, 0x5f, 0xeb, 0xa6, 0xd1, 0x8d, + 0xc8, 0xa6, 0x8c, 0x65, 0xa2, 0x99, 0x16, 0xb3, 0xeb, 0x55, 0xcb, 0x0f, 0xaa, 0xf0, 0x63, 0xc4, + 0xa8, 0x19, 0xf0, 0x5d, 0xf3, 0x83, 0x6d, 0x66, 0xd7, 0x81, 0x49, 0x6c, 0xe2, 0x0d, 0x98, 0xf1, + 0xd1, 0x98, 0x00, 0xe9, 0x31, 0xb7, 0xd0, 0x6c, 0x5f, 0x27, 0xec, 0xd7, 0xd4, 0xc4, 0x48, 0xd0, + 0x69, 0x29, 0x74, 0x1d, 0x18, 0x40, 0xed, 0x2b, 0x15, 0xd4, 0xe4, 0x68, 0x54, 0x29, 0x55, 0x50, + 0xa3, 0x35, 0x85, 0x03, 0x35, 0x35, 0x56, 0x4d, 0x01, 0x3a, 0x54, 0x53, 0xce, 0x4c, 0x8f, 0x55, + 0x53, 0xce, 0x94, 0xd9, 0xd7, 0x06, 0xd0, 0x89, 0xd1, 0xb3, 0xaf, 0x45, 0x94, 0x0e, 0xb2, 0x6f, + 0x74, 0x98, 0x3a, 0x39, 0x5e, 0xf6, 0x8d, 0x0e, 0x1b, 0xce, 0x1e, 0x98, 0x53, 0xe3, 0x65, 0x0f, + 0xcc, 0xe1, 0xec, 0x01, 0x8a, 0xc6, 0xcc, 0xbe, 0xd1, 0x61, 0xda, 0x7b, 0x34, 0xcf, 0x9b, 0x6c, + 0x93, 0xd2, 0x86, 0x49, 0xda, 0x56, 0x60, 0xf7, 0x1a, 0x10, 0x67, 0xd1, 0xa4, 0x4f, 0x69, 0xa3, + 0xea, 0xda, 0x4c, 0x55, 0x8a, 0x89, 0x52, 0xd2, 0x9c, 0x80, 0xf5, 0x0b, 0x9b, 0xe1, 0x0d, 0x84, + 0x06, 0x03, 0x8a, 0xb7, 0x4b, 0xa6, 0xbc, 0xa8, 0xcb, 0x79, 0x09, 0xd3, 0x4c, 0x17, 0x53, 0x56, + 0x4e, 0x33, 0x7d, 0xd3, 0x72, 0x88, 0xc4, 0x9a, 0x11, 0x4f, 0xed, 0x6b, 0x1c, 0x65, 0x22, 0x91, + 0xf1, 0x3c, 0x9a, 0x90, 0x21, 0x79, 0x5f, 0x27, 0xcd, 0xb4, 0x88, 0x88, 0x5f, 0xa2, 0x4c, 0x20, + 0x6c, 0xa0, 0x43, 0x47, 0x6c, 0x50, 0x24, 0x11, 0xdb, 0xcc, 0xc6, 0x1e, 0x9a, 0x16, 0xab, 0x2a, + 0xcc, 0x63, 0xa6, 0x26, 0x8a, 0x89, 0x52, 0xa6, 0x9c, 0x1d, 0xca, 0xa1, 0xa7, 0xfe, 0x29, 0x75, + 0xbd, 0xca, 0x7d, 0x08, 0xf6, 0xe5, 0x67, 0xa1, 0xf4, 0x0f, 0xc1, 0xc0, 0x81, 0x99, 0x52, 0x31, + 0x5f, 0xe0, 0x0a, 0xe2, 0x75, 0xaf, 0xbe, 0xa5, 0x01, 0x6c, 0xf2, 0xbe, 0xbd, 0x32, 0x5e, 0x12, + 0xe2, 0x89, 0x1b, 0xb0, 0x21, 0x7c, 0xb4, 0xd7, 0x48, 0xbd, 0xf8, 0xad, 0xe4, 0x5c, 0x7c, 0x88, + 0x52, 0x50, 0x2a, 0xf1, 0xa5, 0x32, 0xe5, 0x9b, 0xfa, 0xf0, 0xcb, 0xa6, 0x47, 0x7c, 0x24, 0x5a, + 0xd8, 0x97, 0x3f, 0x27, 0x50, 0x8a, 0x53, 0xf1, 0x47, 0x05, 0x25, 0xd6, 0xfc, 0x00, 0x17, 0xce, + 0xfb, 0x9e, 0x7b, 0x59, 0x72, 0xc5, 0xcb, 0x0d, 0x84, 0x1a, 0x6d, 0xf5, 0xc3, 0xb7, 0xdf, 0x47, + 0xf1, 0xc7, 0xf8, 0x91, 0x01, 0x96, 0xcb, 0x1e, 0x09, 0xdb, 0x34, 0xd8, 0x35, 0xce, 0xbd, 0xc4, + 0x96, 0x1f, 0x18, 0x07, 0x43, 0x6f, 0xd4, 0xa1, 0x71, 0xc0, 0x9f, 0x99, 0x43, 0xbc, 0x8f, 0x92, + 0x30, 0xf7, 0xf1, 0xa5, 0xb1, 0x7a, 0xd7, 0x34, 0xb7, 0x70, 0x85, 0x85, 0x94, 0xb3, 0xc4, 0xe5, + 0xdc, 0xc6, 0x0b, 0xd7, 0xc9, 0x61, 0xf8, 0x48, 0x19, 0xbe, 0x91, 0x77, 0xfe, 0x4a, 0xbf, 0xd8, + 0x2d, 0xb9, 0xd2, 0xf5, 0x86, 0x52, 0xcd, 0x0a, 0x57, 0x73, 0x0f, 0x2f, 0x5d, 0xa9, 0x86, 0xf7, + 0x81, 0xbc, 0xb0, 0x95, 0xe7, 0xc7, 0x67, 0x79, 0xe5, 0xe4, 0x2c, 0xaf, 0xfc, 0x3a, 0xcb, 0x2b, + 0x9f, 0xba, 0xf9, 0xd8, 0x49, 0x37, 0x1f, 0xfb, 0xde, 0xcd, 0xc7, 0xde, 0xe8, 0x91, 0xeb, 0x78, + 0x11, 0xf7, 0x2e, 0x02, 0xe4, 0x57, 0xb3, 0x96, 0xe6, 0xff, 0x2f, 0x3c, 0xf8, 0x13, 0x00, 0x00, + 0xff, 0xff, 0xbe, 0x3b, 0xe3, 0xc8, 0x16, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -865,6 +874,16 @@ func (m *PoolRewards) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + { + size, err := m.EdenForward.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 if len(m.RewardCoins) > 0 { for iNdEx := len(m.RewardCoins) - 1; iNdEx >= 0; iNdEx-- { { @@ -1047,6 +1066,8 @@ func (m *PoolRewards) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } + l = m.EdenForward.Size() + n += 1 + l + sovQuery(uint64(l)) return n } @@ -1974,6 +1995,39 @@ func (m *PoolRewards) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EdenForward", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.EdenForward.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) diff --git a/x/masterchef/keeper/pool_rewards_accum.go b/x/masterchef/keeper/pool_rewards_accum.go index 8a64d953c..94b506644 100644 --- a/x/masterchef/keeper/pool_rewards_accum.go +++ b/x/masterchef/keeper/pool_rewards_accum.go @@ -122,6 +122,32 @@ func (k Keeper) LastPoolRewardsAccum(ctx sdk.Context, poolId uint64) types.PoolR } } +// Returns eden rewards using forward calc for 24 hours +func (k Keeper) ForwardEdenCalc(ctx sdk.Context, poolId uint64) sdk.Dec { + store := ctx.KVStore(k.storeKey) + iter := sdk.KVStoreReversePrefixIterator(store, types.GetPoolRewardsAccumPrefix(poolId)) + defer iter.Close() + + var lastTwo []types.PoolRewardsAccum + for ; iter.Valid() && len(lastTwo) < 2; iter.Next() { + accum := types.PoolRewardsAccum{} + k.cdc.MustUnmarshal(iter.Value(), &accum) + lastTwo = append([]types.PoolRewardsAccum{accum}, lastTwo...) + } + + if len(lastTwo) == 2 { + diff := lastTwo[1].EdenReward.Sub(lastTwo[0].EdenReward) + // Here we are assuming average block time of 4s + // 1 DAY = 86400 + // Note: This calculation maybe used in FE, the idea is to + // give estimated numbers of rewards that a user will get + return diff.MulInt64(21600) + } + + // Return zero if there are not enough entries + return sdk.ZeroDec() +} + func (k Keeper) AddPoolRewardsAccum(ctx sdk.Context, poolId, timestamp uint64, height int64, dexReward, gasReward, edenReward math.LegacyDec) { lastAccum := k.LastPoolRewardsAccum(ctx, poolId) lastAccum.Timestamp = timestamp diff --git a/x/masterchef/keeper/pool_rewards_accum_test.go b/x/masterchef/keeper/pool_rewards_accum_test.go index 1de4a837b..a3d2f088a 100644 --- a/x/masterchef/keeper/pool_rewards_accum_test.go +++ b/x/masterchef/keeper/pool_rewards_accum_test.go @@ -6,6 +6,7 @@ import ( "cosmossdk.io/math" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + sdk "github.com/cosmos/cosmos-sdk/types" simapp "github.com/elys-network/elys/app" "github.com/elys-network/elys/x/masterchef/types" "github.com/stretchr/testify/require" @@ -71,3 +72,70 @@ func TestPoolRewardsAccum(t *testing.T) { accum = app.MasterchefKeeper.LastPoolRewardsAccum(ctx, 1) require.Equal(t, accum, accums[1]) } + +func TestAddPoolRewardsAccum(t *testing.T) { + app := simapp.InitElysTestApp(true) + ctx := app.BaseApp.NewContext(true, tmproto.Header{}) + k := app.MasterchefKeeper + + tests := []struct { + name string + poolId uint64 + timestamp uint64 + height int64 + dexReward math.LegacyDec + gasReward math.LegacyDec + edenReward math.LegacyDec + }{ + { + name: "Add rewards to new pool", + poolId: 1, + timestamp: uint64(time.Now().Unix()), + height: 100, + dexReward: math.LegacyNewDec(10), + gasReward: math.LegacyNewDec(5), + edenReward: math.LegacyNewDec(3), + }, + { + name: "Add rewards to existing pool", + poolId: 1, + timestamp: uint64(time.Now().Unix()) + 3600, // 1 hour later + height: 200, + dexReward: math.LegacyNewDec(20), + gasReward: math.LegacyNewDec(10), + edenReward: math.LegacyNewDec(6), + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + k.AddPoolRewardsAccum(ctx, tt.poolId, tt.timestamp, tt.height, tt.dexReward, tt.gasReward, tt.edenReward) + + accum, err := k.GetPoolRewardsAccum(ctx, tt.poolId, tt.timestamp) + require.NoError(t, err) + + require.Equal(t, tt.poolId, accum.PoolId) + require.Equal(t, tt.timestamp, accum.Timestamp) + require.Equal(t, tt.height, accum.BlockHeight) + + if tt.name == "Add rewards to new pool" { + require.Equal(t, tt.dexReward, accum.DexReward) + require.Equal(t, tt.gasReward, accum.GasReward) + require.Equal(t, tt.edenReward, accum.EdenReward) + + // Check forward + forwardEden := k.ForwardEdenCalc(ctx, tt.poolId) + require.Equal(t, sdk.ZeroDec(), forwardEden) + } else { + // For existing pool, rewards should be cumulative + require.Equal(t, math.LegacyNewDec(30), accum.DexReward) + require.Equal(t, math.LegacyNewDec(15), accum.GasReward) + require.Equal(t, math.LegacyNewDec(9), accum.EdenReward) + + // Check forward + forwardEden := k.ForwardEdenCalc(ctx, tt.poolId) + require.Equal(t, sdk.MustNewDecFromStr("21600").Mul(tt.edenReward), forwardEden) + } + }) + } +} diff --git a/x/parameter/keeper/msg_server_update_rewards_data_lifetime.go b/x/parameter/keeper/msg_server_update_rewards_data_lifetime.go index 0c2482f04..73caf98e5 100644 --- a/x/parameter/keeper/msg_server_update_rewards_data_lifetime.go +++ b/x/parameter/keeper/msg_server_update_rewards_data_lifetime.go @@ -21,6 +21,10 @@ func (k msgServer) UpdateRewardsDataLifetime(goCtx context.Context, msg *types.M return nil, errorsmod.Wrapf(types.ErrInvalidRewardsDataLifecycle, "invalid data in rewards_data_lifecycle") } + if !rewardsDataLifetime.IsPositive() { + return nil, errorsmod.Wrapf(types.ErrInvalidRewardsDataLifecycle, "rewards_data_lifecycle must be positive") + } + params := k.GetParams(ctx) params.RewardsDataLifetime = rewardsDataLifetime.Int64() k.SetParams(ctx, params) diff --git a/x/parameter/keeper/msg_server_update_rewards_data_lifetime_test.go b/x/parameter/keeper/msg_server_update_rewards_data_lifetime_test.go new file mode 100644 index 000000000..cb05fe617 --- /dev/null +++ b/x/parameter/keeper/msg_server_update_rewards_data_lifetime_test.go @@ -0,0 +1,74 @@ +package keeper_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + keepertest "github.com/elys-network/elys/testutil/keeper" + "github.com/elys-network/elys/x/parameter/keeper" + "github.com/elys-network/elys/x/parameter/types" + "github.com/stretchr/testify/require" +) + +func TestMsgServer_UpdateRewardsDataLifetime(t *testing.T) { + k, ctx := keepertest.ParameterKeeper(t) + srv := keeper.NewMsgServerImpl(*k) + wctx := sdk.WrapSDKContext(ctx) + + tests := []struct { + name string + msg *types.MsgUpdateRewardsDataLifetime + want *types.MsgUpdateRewardsDataLifetimeResponse + wantErr bool + }{ + { + name: "Valid positive rewards data lifetime", + msg: &types.MsgUpdateRewardsDataLifetime{ + Creator: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", + RewardsDataLifetime: "100", + }, + want: &types.MsgUpdateRewardsDataLifetimeResponse{}, + wantErr: false, + }, + { + name: "Invalid zero rewards data lifetime", + msg: &types.MsgUpdateRewardsDataLifetime{ + Creator: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", + RewardsDataLifetime: "0", + }, + want: nil, + wantErr: true, + }, + { + name: "Invalid negative rewards data lifetime", + msg: &types.MsgUpdateRewardsDataLifetime{ + Creator: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", + RewardsDataLifetime: "-10", + }, + want: nil, + wantErr: true, + }, + { + name: "Invalid non-numeric rewards data lifetime", + msg: &types.MsgUpdateRewardsDataLifetime{ + Creator: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", + RewardsDataLifetime: "abc", + }, + want: nil, + wantErr: true, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := srv.UpdateRewardsDataLifetime(wctx, tt.msg) + if tt.wantErr { + require.Error(t, err) + require.Nil(t, got) + } else { + require.NoError(t, err) + require.Equal(t, tt.want, got) + } + }) + } +}