feat: return voting power weights at pool query (#71)

* return voting power weight when we return pool query * fix naming
initia-labs · Feb 1, 2024 · c808514 · c808514
1 parent 5d7f18a
commit c808514
Show file tree

Hide file tree

Showing 5 changed files with 736 additions and 650 deletions.
diff --git a/proto/initia/mstaking/v1/staking.proto b/proto/initia/mstaking/v1/staking.proto
@@ -368,6 +368,11 @@ message Pool {
     (gogoproto.nullable)     = false,
     (gogoproto.moretags)     = "yaml:\"bonded_tokens\""
   ];
+  repeated cosmos.base.v1beta1.DecCoin voting_power_weights = 3 [
+    (gogoproto.moretags)     = "yaml:\"voting_power_weights\"",
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins",
+    (gogoproto.nullable)     = false
+  ];
 }
 
 // Infraction indicates the infraction a validator commited.

diff --git a/x/mstaking/keeper/grpc_query.go b/x/mstaking/keeper/grpc_query.go
@@ -376,10 +376,15 @@ func (q Querier) DelegatorValidators(ctx context.Context, req *types.QueryDelega
 func (q Querier) Pool(ctx context.Context, _ *types.QueryPoolRequest) (*types.QueryPoolResponse, error) {
 	bondedPool := q.GetBondedPool(ctx)
 	notBondedPool := q.GetNotBondedPool(ctx)
+	powerWeights, err := q.GetVotingPowerWeights(ctx)
+	if err != nil {
+		return nil, err
+	}
 
 	pool := types.NewPool(
 		q.bankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress()),
 		q.bankKeeper.GetAllBalances(ctx, bondedPool.GetAddress()),
+		powerWeights,
 	)
 
 	return &types.QueryPoolResponse{Pool: pool}, nil

diff --git a/x/mstaking/keeper/grpc_query_test.go b/x/mstaking/keeper/grpc_query_test.go
@@ -437,8 +437,9 @@ func Test_grpcPool(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Equal(t, res.Pool, types.Pool{
-		NotBondedTokens: sdk.NewCoins(),
-		BondedTokens:    sdk.NewCoins(sdk.NewCoin(bondDenom, math.NewInt(2_000_000))),
+		NotBondedTokens:    sdk.NewCoins(),
+		BondedTokens:       sdk.NewCoins(sdk.NewCoin(bondDenom, math.NewInt(2_000_000))),
+		VotingPowerWeights: sdk.NewDecCoins(sdk.NewDecCoin(bondDenom, math.OneInt())),
 	})
 }
 

diff --git a/x/mstaking/types/pool.go b/x/mstaking/types/pool.go
@@ -15,9 +15,10 @@ const (
 )
 
 // NewPool creates a new Pool instance used for queries
-func NewPool(notBonded, bonded sdk.Coins) Pool {
+func NewPool(notBonded, bonded sdk.Coins, votingPowerWeights sdk.DecCoins) Pool {
 	return Pool{
-		NotBondedTokens: notBonded,
-		BondedTokens:    bonded,
+		NotBondedTokens:    notBonded,
+		BondedTokens:       bonded,
+		VotingPowerWeights: votingPowerWeights,
 	}
 }