chore: refactor x/query

KYVENetwork · Oct 3, 2023 · 0c0cec8 · 0c0cec8
1 parent 8a7fea3
commit 0c0cec8
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 95 deletions.
diff --git a/app/app.go b/app/app.go
@@ -659,6 +659,7 @@ func NewKYVEApp(
 		app.GlobalKeeper,
 		*app.GovKeeper,
 		app.TeamKeeper,
+		app.FundersKeeper,
 	)
 	// this line is used by starport scaffolding # stargate/app/keeperDefinition
 

diff --git a/x/query/keeper/grpc_account_funded.go b/x/query/keeper/grpc_account_funded.go
@@ -19,27 +19,29 @@ func (k Keeper) AccountFundedList(goCtx context.Context, req *types.QueryAccount
 
 	pools := k.poolKeeper.GetAllPools(ctx)
 
-	for i := range pools {
-		pool := pools[i]
-		// TODO(rapha): fix this
-		//amount := pool.GetFunderAmount(req.Address)
-		amount := uint64(0)
+	for _, pool := range pools {
+		funding, found := k.fundersKeeper.GetFunding(ctx, req.Address, pool.Id)
+		if !found {
+			return nil, status.Error(codes.Internal, "funding not found")
+		}
+		fundingState, found := k.fundersKeeper.GetFundingState(ctx, pool.Id)
+		if !found {
+			return nil, status.Error(codes.Internal, "funding state not found")
+		}
 
-		if amount > 0 {
+		if funding.Amount > 0 {
 			funded = append(funded, types.Funded{
-				Amount: amount,
+				Amount: funding.Amount,
 				Pool: &types.BasicPool{
-					Id:             pool.Id,
-					Name:           pool.Name,
-					Runtime:        pool.Runtime,
-					Logo:           pool.Logo,
-					OperatingCost:  pool.OperatingCost,
-					UploadInterval: pool.UploadInterval,
-					// TODO(rapha): fix this
-					TotalFunds: 0,
-					//TotalFunds:      pool.TotalFunds,
-					TotalDelegation: k.delegationKeeper.GetDelegationOfPool(ctx, pool.Id),
-					Status:          k.GetPoolStatus(ctx, &pool),
+					Id:                   pool.Id,
+					Name:                 pool.Name,
+					Runtime:              pool.Runtime,
+					Logo:                 pool.Logo,
+					InflationShareWeight: pool.InflationShareWeight,
+					UploadInterval:       pool.UploadInterval,
+					TotalFunds:           fundingState.TotalAmount,
+					TotalDelegation:      k.delegationKeeper.GetDelegationOfPool(ctx, pool.Id),
+					Status:               k.GetPoolStatus(ctx, &pool, &fundingState),
 				},
 			})
 		}

diff --git a/x/query/keeper/grpc_query_pool.go b/x/query/keeper/grpc_query_pool.go
@@ -70,7 +70,7 @@ func (k Keeper) parsePoolResponse(ctx sdk.Context, pool *poolTypes.Pool) types.P
 		Stakers:             stakers,
 		TotalSelfDelegation: totalSelfDelegation,
 		TotalDelegation:     totalDelegation,
-		Status:              k.GetPoolStatus(ctx, pool),
+		Status:              k.GetPoolStatus(ctx, pool, nil),
 		Account:             poolAccount.String(),
 		AccountBalance:      poolBalance,
 	}

diff --git a/x/query/keeper/helper.go b/x/query/keeper/helper.go
@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	funderstypes "github.com/KYVENetwork/chain/x/funders/types"
 	globalTypes "github.com/KYVENetwork/chain/x/global/types"
 	pooltypes "github.com/KYVENetwork/chain/x/pool/types"
 	"github.com/KYVENetwork/chain/x/query/types"
@@ -37,23 +38,23 @@ func (k Keeper) GetFullStaker(ctx sdk.Context, stakerAddress string) *types.Full
 	for _, valaccount := range k.stakerKeeper.GetValaccountsFromStaker(ctx, staker.Address) {
 
 		pool, _ := k.poolKeeper.GetPool(ctx, valaccount.PoolId)
+		fundingState, _ := k.fundersKeeper.GetFundingState(ctx, valaccount.PoolId)
 
 		accountValaddress, _ := sdk.AccAddressFromBech32(valaccount.Valaddress)
 		balanceValaccount := k.bankKeeper.GetBalance(ctx, accountValaddress, globalTypes.Denom).Amount.Uint64()
 
 		poolMemberships = append(
 			poolMemberships, &types.PoolMembership{
 				Pool: &types.BasicPool{
-					Id:             pool.Id,
-					Name:           pool.Name,
-					Runtime:        pool.Runtime,
-					Logo:           pool.Logo,
-					OperatingCost:  pool.OperatingCost,
-					UploadInterval: pool.UploadInterval,
-					// TODO(rapha): fix this
-					//TotalFunds:      pool.TotalFunds,
-					TotalDelegation: k.delegationKeeper.GetDelegationOfPool(ctx, pool.Id),
-					Status:          k.GetPoolStatus(ctx, &pool),
+					Id:                   pool.Id,
+					Name:                 pool.Name,
+					Runtime:              pool.Runtime,
+					Logo:                 pool.Logo,
+					InflationShareWeight: pool.InflationShareWeight,
+					UploadInterval:       pool.UploadInterval,
+					TotalFunds:           fundingState.TotalAmount,
+					TotalDelegation:      k.delegationKeeper.GetDelegationOfPool(ctx, pool.Id),
+					Status:               k.GetPoolStatus(ctx, &pool, &fundingState),
 				},
 				Points:     valaccount.Points,
 				IsLeaving:  valaccount.IsLeaving,
@@ -82,22 +83,27 @@ func (k Keeper) GetFullStaker(ctx sdk.Context, stakerAddress string) *types.Full
 	}
 }
 
-func (k Keeper) GetPoolStatus(ctx sdk.Context, pool *pooltypes.Pool) pooltypes.PoolStatus {
+func (k Keeper) GetPoolStatus(ctx sdk.Context, pool *pooltypes.Pool, fundingState *funderstypes.FundingState) pooltypes.PoolStatus {
 	totalDelegation := k.delegationKeeper.GetDelegationOfPool(ctx, pool.Id)
 
 	var poolStatus pooltypes.PoolStatus
 
+	poolStatus = pooltypes.POOL_STATUS_ACTIVE
 	if pool.UpgradePlan.ScheduledAt > 0 && uint64(ctx.BlockTime().Unix()) >= pool.UpgradePlan.ScheduledAt {
 		poolStatus = pooltypes.POOL_STATUS_UPGRADING
 	} else if pool.Disabled {
 		poolStatus = pooltypes.POOL_STATUS_DISABLED
 	} else if totalDelegation < pool.MinDelegation {
 		poolStatus = pooltypes.POOL_STATUS_NOT_ENOUGH_DELEGATION
-		// TODO(rapha): fix this
-		//} else if pool.TotalFunds == 0 {
-		//	poolStatus = pooltypes.POOL_STATUS_NO_FUNDS
 	} else {
-		poolStatus = pooltypes.POOL_STATUS_ACTIVE
+		// Get funding state if not provided
+		if fundingState == nil {
+			fs, _ := k.fundersKeeper.GetFundingState(ctx, pool.Id)
+			fundingState = &fs
+		}
+		if fundingState.TotalAmount == 0 {
+			poolStatus = pooltypes.POOL_STATUS_NO_FUNDS
+		}
 	}
 
 	return poolStatus

diff --git a/x/query/keeper/keeper.go b/x/query/keeper/keeper.go
@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"fmt"
+	fundersKeeper "github.com/KYVENetwork/chain/x/funders/keeper"
 
 	globalKeeper "github.com/KYVENetwork/chain/x/global/keeper"
 	teamKeeper "github.com/KYVENetwork/chain/x/team/keeper"
@@ -41,6 +42,7 @@ type (
 		globalKeeper     globalKeeper.Keeper
 		govKeeper        govkeeper.Keeper
 		teamKeeper       teamKeeper.Keeper
+		fundersKeeper    fundersKeeper.Keeper
 	}
 )
 
@@ -60,6 +62,7 @@ func NewKeeper(
 	globalKeeper globalKeeper.Keeper,
 	govKeeper govkeeper.Keeper,
 	teamKeeper teamKeeper.Keeper,
+	fundersKeeper fundersKeeper.Keeper,
 ) *Keeper {
 	return &Keeper{
 		cdc:        cdc,
@@ -77,6 +80,7 @@ func NewKeeper(
 		globalKeeper:     globalKeeper,
 		govKeeper:        govKeeper,
 		teamKeeper:       teamKeeper,
+		fundersKeeper:    fundersKeeper,
 	}
 }
 

diff --git a/x/query/types/query.pb.go b/x/query/types/query.pb.go