Merge branch 'main' into mbreithecker/migration

proto/kyve/query/v1beta1/query.proto

@@ -4,6 +4,7 @@ package kyve.query.v1beta1;
 
 import "amino/amino.proto";
 import "cosmos/base/v1beta1/coin.proto";
+import "cosmos/staking/v1beta1/staking.proto";
 import "gogoproto/gogo.proto";
 import "kyve/pool/v1beta1/pool.proto";
 
@@ -57,8 +58,8 @@ message BasicPool {
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
 
-  // total_delegation of the pool
-  uint64 total_delegation = 8;
+  // total_stake of the pool
+  uint64 total_stake = 8;
 
   // status of the pool if pool is able
   // to produce bundles, etc.
@@ -72,80 +73,38 @@ message FullStaker {
   // address of the staker
   string address = 1;
 
-  // metadata as logo, moniker, etc.
-  StakerMetadata metadata = 2;
+  cosmos.staking.v1beta1.Validator validator = 2;
 
-  // amount the staker has delegated to himself
-  uint64 self_delegation = 3;
-
-  // unbonding_amount is the amount the staker is currently unbonding
-  // from the self-delegation.
-  // This amount can be larger than `amount` when the staker
-  // got slashed during unbonding. However, at the end of
-  // the unbonding period this amount is double checked with the
-  // remaining amount.
-  uint64 self_delegation_unbonding = 4;
-
-  // total_delegation returns the sum of all $KYVE users
-  // have delegated to this staker
-  uint64 total_delegation = 5;
-
-  // delegator_count is the total number of individual
-  // delegator addresses for that user.
-  uint64 delegator_count = 6;
+  // total_pool_stake returns the amount the validator has in total
+  // staked in all his pools
+  uint64 total_pool_stake = 3;
 
   // pools is a list of all pools the staker is currently
   // participating, i.e. allowed to vote and upload data.
-  repeated PoolMembership pools = 7;
+  repeated PoolMembership pools = 4;
 }
 
-// StakerMetadata contains static information for a staker
-message StakerMetadata {
-  // commission is the percentage of the rewards that will
-  // get transferred to the staker before the remaining
-  // rewards are split across all delegators
+// CommissionChangeEntry shows when the old commission
+// of a staker will change to the new commission
+message CommissionChangeEntry {
+  // commission is the new commission that will
+  // become active once the change-time is over
   string commission = 1 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
 
-  // moniker is a human-readable name for displaying
-  // the staker in the UI
-  string moniker = 2;
-
-  // website is a https-link to the website of the staker
-  string website = 3;
-
-  // identity from keybase.io
-  string identity = 4;
-
-  // security_contact ...
-  string security_contact = 5;
-
-  // details ...
-  string details = 6;
-
-  // pending_commission_change shows if the staker plans
-  // to change its commission. Delegators will see a warning in
-  // the UI. A Commission change takes some time until
-  // the commission is applied. Users have time to redelegate
-  // if they not agree with the new commission.
-  CommissionChangeEntry pending_commission_change = 7;
-
-  // commission_rewards are the rewards through commission and storage cost
-  repeated cosmos.base.v1beta1.Coin commission_rewards = 8 [
-    (gogoproto.nullable) = false,
-    (amino.dont_omitempty) = true,
-    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-  ];
+  // creation_date is the UNIX-timestamp (in seconds)
+  // of when the entry was created.
+  int64 creation_date = 2;
 }
 
-// CommissionChangeEntry shows when the old commission
-// of a staker will change to the new commission
-message CommissionChangeEntry {
-  // commission is the new commission that will
+// StakeFractionChangeEntry shows when the old stake fraction
+// of a staker will change to the new stake fraction
+message StakeFractionChangeEntry {
+  // stake_fraction is the new stake_fraction that will
   // become active once the change-time is over
-  string commission = 1 [
+  string stake_fraction = 1 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
@@ -181,4 +140,38 @@ message PoolMembership {
   // whether or not the valaccount needs additional funds to
   // pay for gas fees
   uint64 balance = 5;
+
+  // commission is the commission the validator has chosen for
+  // this specific pool
+  string commission = 6 [
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+    (gogoproto.nullable) = false
+  ];
+
+  // pending_commission_change shows if the staker plans
+  // to change its commission. Delegators will see a warning in
+  // the UI. A Commission change takes some time until
+  // the commission is applied. Users have time to redelegate
+  // if they not agree with the new commission.
+  CommissionChangeEntry pending_commission_change = 7;
+
+  // stake fraction is a percentage the validator has chosen for
+  // this pool. It is the fraction of how much of his total stake
+  // the validator wants to stake in this specific pool
+  string stake_fraction = 8 [
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+    (gogoproto.nullable) = false
+  ];
+
+  // pending_stake_fraction_change shows if the staker plans
+  // to change its stake fraction. Delegators will see a warning in
+  // the UI. A stake fraction change takes some time until
+  // the stake fraction is applied. Users have time to redelegate
+  // if they not agree with the new stake fraction.
+  StakeFractionChangeEntry pending_stake_fraction_change = 9;
+
+  // pool stake shows the actual amount the validator has staked
+  // in this pool. It can be lower than the specified stake fraction
+  // because of the max voting power limit
+  uint64 pool_stake = 10;
 }

proto/kyve/query/v1beta1/stakers.proto

@@ -6,7 +6,6 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "kyve/query/v1beta1/query.proto";
-import "kyve/stakers/v1beta1/stakers.proto";
 
 option go_package = "github.com/KYVENetwork/chain/x/query/types";
 
@@ -56,10 +55,14 @@ enum StakerStatus {
 
   // STAKER_STATUS_UNSPECIFIED ...
   STAKER_STATUS_UNSPECIFIED = 0;
-  // STAKER_STATUS_ACTIVE ...
-  STAKER_STATUS_ACTIVE = 1;
-  // STAKER_STATUS_INACTIVE ...
-  STAKER_STATUS_INACTIVE = 2;
+  // STAKER_STATUS_PROTOCOL_ACTIVE ...
+  STAKER_STATUS_PROTOCOL_ACTIVE = 1;
+  // STAKER_STATUS_PROTOCOL_INACTIVE ...
+  STAKER_STATUS_PROTOCOL_INACTIVE = 2;
+  // STAKER_STATUS_CHAIN_ACTIVE ...
+  STAKER_STATUS_CHAIN_ACTIVE = 3;
+  // STAKER_STATUS_CHAIN_INACTIVE ...
+  STAKER_STATUS_CHAIN_INACTIVE = 4;
 }
 
 // QueryStakersResponse is the response type for the Query/Stakers RPC method.
@@ -99,19 +102,11 @@ message QueryStakersByPoolRequest {
 // QueryStakersByPoolResponse is the response type for the Query/Staker RPC method.
 message QueryStakersByPoolResponse {
   // stakers ...
-  repeated StakerPoolResponse stakers = 1 [(gogoproto.nullable) = false];
-}
-
-// StakerPoolResponse ...
-message StakerPoolResponse {
-  // staker ...
-  FullStaker staker = 1;
-  // valaccount ...
-  kyve.stakers.v1beta1.Valaccount valaccount = 2;
+  repeated FullStaker stakers = 1 [(gogoproto.nullable) = false];
 }
 
 // =========================
-// stakers_by_pool/{pool_id}
+// stakers_by_pool_count
 // =========================
 
 // QueryStakersByPoolCountRequest ...

testutil/integration/checks.go

@@ -2,6 +2,7 @@ package integration
 
 import (
 	"fmt"
+	"sort"
 	"time"
 
 	"github.com/KYVENetwork/chain/util"
@@ -123,19 +124,18 @@ func (suite *KeeperTestSuite) VerifyPoolQueries() {
 
 		// test stakers by pool
 		valaccounts := suite.App().StakersKeeper.GetAllValaccountsOfPool(suite.Ctx(), poolsState[i].Id)
-		stakersByPoolState := make([]querytypes.StakerPoolResponse, 0)
+		stakersByPoolState := make([]querytypes.FullStaker, 0)
 
 		for _, valaccount := range valaccounts {
-			_, stakerFound := suite.App().StakersKeeper.GetValidator(suite.Ctx(), valaccount.Staker)
-
-			if stakerFound {
-				stakersByPoolState = append(stakersByPoolState, querytypes.StakerPoolResponse{
-					Staker:     suite.App().QueryKeeper.GetFullStaker(suite.Ctx(), valaccount.Staker),
-					Valaccount: valaccount,
-				})
+			if _, stakerFound := suite.App().StakersKeeper.GetValidator(suite.Ctx(), valaccount.Staker); stakerFound {
+				stakersByPoolState = append(stakersByPoolState, *suite.App().QueryKeeper.GetFullStaker(suite.Ctx(), valaccount.Staker))
 			}
 		}
 
+		sort.SliceStable(stakersByPoolState, func(a, b int) bool {
+			return suite.App().StakersKeeper.GetValidatorPoolStake(suite.Ctx(), stakersByPoolState[a].Address, poolsState[i].Id) > suite.App().StakersKeeper.GetValidatorPoolStake(suite.Ctx(), stakersByPoolState[b].Address, poolsState[i].Id)
+		})
+
 		stakersByPoolQuery, stakersByPoolQueryErr := suite.App().QueryKeeper.StakersByPool(suite.Ctx(), &querytypes.QueryStakersByPoolRequest{
 			PoolId: poolsState[i].Id,
 		})

testutil/integration/helpers.go

@@ -86,3 +86,9 @@ func (suite *KeeperTestSuite) GetNextUploader() (nextStaker string, nextValaddre
 
 	return
 }
+
+func (suite *KeeperTestSuite) SetMaxVotingPower(maxVotingPower string) {
+	params := suite.App().PoolKeeper.GetParams(suite.Ctx())
+	params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr(maxVotingPower)
+	suite.App().PoolKeeper.SetParams(suite.Ctx(), params)
+}

x/bundles/keeper/keeper_suite_invalid_bundles_test.go

@@ -64,9 +64,7 @@ var _ = Describe("invalid bundles", Ordered, func() {
 		}
 		s.RunTxPoolSuccess(msg)
 
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("1")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("1")
 
 		s.RunTxFundersSuccess(&funderstypes.MsgCreateFunder{
 			Creator: i.ALICE,

x/bundles/keeper/keeper_suite_valid_bundles_test.go

@@ -966,9 +966,7 @@ var _ = Describe("valid bundles", Ordered, func() {
 
 	It("Produce a valid bundle with multiple validators and foreign delegation although some voted invalid with maximum voting power", func() {
 		// ARRANGE
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("0.4")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("0.4")
 
 		s.CreateValidator(i.STAKER_2, "Staker-2", int64(100*i.KYVE))
 

x/bundles/keeper/logic_bundles_test.go

@@ -307,9 +307,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() {
 
 	It("Assert pool can run while voting power of one node exceeds 40%", func() {
 		// ARRANGE
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("0.4")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("0.4")
 
 		msg := &pooltypes.MsgCreatePool{
 			Authority:            gov,
@@ -371,9 +369,7 @@ var _ = Describe("logic_bundles.go", Ordered, func() {
 
 	It("Assert pool can run with a single staker while voting power is 100%", func() {
 		// ARRANGE
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("1")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("1")
 
 		msg := &pooltypes.MsgCreatePool{
 			Authority:            gov,

x/bundles/keeper/logic_end_block_handle_upload_timeout_test.go

@@ -289,9 +289,7 @@ var _ = Describe("logic_end_block_handle_upload_timeout.go", Ordered, func() {
 			PoolId:  0,
 		})
 
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("0.2")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("0.2")
 
 		// ACT
 		s.CommitAfterSeconds(1)

x/bundles/keeper/logic_round_robin_test.go

@@ -101,9 +101,7 @@ var _ = Describe("logic_round_robin.go", Ordered, func() {
 		}
 		s.App().PoolKeeper.SetPool(s.Ctx(), pool)
 
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("1")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("1")
 	})
 
 	AfterEach(func() {
@@ -269,9 +267,7 @@ var _ = Describe("logic_round_robin.go", Ordered, func() {
 
 	It("Frequency analysis with maximum voting power cap", func() {
 		// ARRANGE
-		params := s.App().PoolKeeper.GetParams(s.Ctx())
-		params.MaxVotingPowerPerPool = math.LegacyMustNewDecFromStr("0.5")
-		s.App().PoolKeeper.SetParams(s.Ctx(), params)
+		s.SetMaxVotingPower("0.5")
 
 		// NOTE that dummy with index 2 has more than 50% voting power, so his effective stake
 		// will be lower

x/query/keeper/grpc_account_funded.go

@@ -35,7 +35,7 @@ func (k Keeper) AccountFundedList(goCtx context.Context, req *types.QueryAccount
 					InflationShareWeight: pool.InflationShareWeight,
 					UploadInterval:       pool.UploadInterval,
 					TotalFunds:           k.fundersKeeper.GetTotalActiveFunding(ctx, pool.Id),
-					TotalDelegation:      k.delegationKeeper.GetDelegationOfPool(ctx, pool.Id),
+					TotalStake:           k.stakerKeeper.GetTotalStakeOfPool(ctx, pool.Id),
 					Status:               k.GetPoolStatus(ctx, &pool),
 				},
 			})

x/query/keeper/grpc_query_staker.go

@@ -26,7 +26,7 @@ func (k Keeper) Stakers(c context.Context, req *types.QueryStakersRequest) (*typ
 		fullStaker := k.GetFullStaker(ctx, address)
 
 		searchAddress := strings.ToLower(fullStaker.Address)
-		searchMoniker := strings.ToLower(fullStaker.Metadata.Moniker)
+		searchMoniker := strings.ToLower(fullStaker.Validator.GetMoniker())
 
 		if strings.Contains(searchAddress, req.Search) || strings.Contains(searchMoniker, req.Search) {
 			if accumulate {
@@ -41,7 +41,7 @@ func (k Keeper) Stakers(c context.Context, req *types.QueryStakersRequest) (*typ
 	var pageRes *query.PageResponse
 	var err error
 
-	pageRes, err = k.stakerKeeper.GetPaginatedStakersByDelegation(ctx, req.Pagination, accumulator)
+	pageRes, err = k.stakerKeeper.GetPaginatedStakersByPoolStake(ctx, req.Pagination, req.Status, accumulator)
 
 	if err != nil {
 		return nil, err

x/query/keeper/grpc_query_stakers_by_pool.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+	"sort"
 
 	"github.com/KYVENetwork/chain/x/query/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -15,24 +16,24 @@ func (k Keeper) StakersByPool(c context.Context, req *types.QueryStakersByPoolRe
 		return nil, status.Error(codes.InvalidArgument, "invalid request")
 	}
 
-	data := make([]types.StakerPoolResponse, 0)
-
 	ctx := sdk.UnwrapSDKContext(c)
 
-	_, found := k.poolKeeper.GetPool(ctx, req.PoolId)
-	if !found {
+	if _, found := k.poolKeeper.GetPool(ctx, req.PoolId); !found {
 		return nil, sdkerrors.ErrKeyNotFound
 	}
 
+	stakers := make([]types.FullStaker, 0)
+
 	valaccounts := k.stakerKeeper.GetAllValaccountsOfPool(ctx, req.PoolId)
 	for _, valaccount := range valaccounts {
-		if _, exist := k.stakerKeeper.GetValidator(ctx, valaccount.Staker); exist {
-			data = append(data, types.StakerPoolResponse{
-				Staker:     k.GetFullStaker(ctx, valaccount.Staker),
-				Valaccount: valaccount,
-			})
-		}
+		stakers = append(stakers, *k.GetFullStaker(ctx, valaccount.Staker))
 	}
 
-	return &types.QueryStakersByPoolResponse{Stakers: data}, nil
+	stakes := k.stakerKeeper.GetValidatorPoolStakes(ctx, req.PoolId)
+
+	sort.SliceStable(stakers, func(i, j int) bool {
+		return stakes[stakers[i].Address] > stakes[stakers[j].Address]
+	})
+
+	return &types.QueryStakersByPoolResponse{Stakers: stakers}, nil
 }