WIP: Queriers for staking to increase Gaia-lite performance

cmd/gaia/app/app.go

@@ -106,7 +106,8 @@ func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		AddRoute("gov", gov.NewHandler(app.govKeeper))
 
 	app.QueryRouter().
-		AddRoute("gov", gov.NewQuerier(app.govKeeper))
+		AddRoute("gov", gov.NewQuerier(app.govKeeper)).
+		AddRoute("stake", stake.NewQuerier(app.stakeKeeper))
 
 	// initialize BaseApp
 	app.SetInitChainer(app.initChainer)

x/gov/queryable.go

@@ -43,14 +43,14 @@ func queryProposals(ctx sdk.Context, path []string, req abci.RequestQuery, keepe
 	var params QueryProposalsParams
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, &params)
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	proposals := keeper.GetProposalsFiltered(ctx, params.Voter, params.Depositer, params.ProposalStatus, params.NumLatestProposals)
 
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, proposals)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }
@@ -64,7 +64,7 @@ func queryProposal(ctx sdk.Context, path []string, req abci.RequestQuery, keeper
 	var params QueryProposalParams
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, &params)
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	proposal := keeper.GetProposal(ctx, params.ProposalID)
@@ -74,7 +74,7 @@ func queryProposal(ctx sdk.Context, path []string, req abci.RequestQuery, keeper
 
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, proposal)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }
@@ -89,13 +89,13 @@ func queryDeposit(ctx sdk.Context, path []string, req abci.RequestQuery, keeper
 	var params QueryDepositParams
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, &params)
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	deposit, _ := keeper.GetDeposit(ctx, params.ProposalID, params.Depositer)
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, deposit)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }
@@ -110,13 +110,13 @@ func queryVote(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Kee
 	var params QueryVoteParams
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, &params)
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	vote, _ := keeper.GetVote(ctx, params.ProposalID, params.Voter)
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, vote)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }
@@ -130,7 +130,7 @@ func queryDeposits(ctx sdk.Context, path []string, req abci.RequestQuery, keeper
 	var params QueryDepositParams
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, &params)
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	var deposits []Deposit
@@ -143,7 +143,7 @@ func queryDeposits(ctx sdk.Context, path []string, req abci.RequestQuery, keeper
 
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, deposits)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }
@@ -158,7 +158,7 @@ func queryVotes(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Ke
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, &params)
 
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	var votes []Vote
@@ -171,7 +171,7 @@ func queryVotes(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Ke
 
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, votes)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }
@@ -187,7 +187,7 @@ func queryTally(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Ke
 	var proposalID int64
 	errRes := keeper.cdc.UnmarshalJSON(req.Data, proposalID)
 	if errRes != nil {
-		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data - %s", errRes.Error()))
+		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
 	proposal := keeper.GetProposal(ctx, proposalID)
@@ -207,7 +207,7 @@ func queryTally(ctx sdk.Context, path []string, req abci.RequestQuery, keeper Ke
 
 	res, errRes = wire.MarshalJSONIndent(keeper.cdc, tallyResult)
 	if errRes != nil {
-		panic("could not marshal result to JSON")
+		panic(fmt.Sprintf("could not marshal result to JSON:\n%s", errRes.Error()))
 	}
 	return res, nil
 }

x/stake/keeper/validator.go

@@ -69,34 +69,33 @@ func (k Keeper) GetAllValidators(ctx sdk.Context) (validators []types.Validator)
 	iterator := sdk.KVStorePrefixIterator(store, ValidatorsKey)
 
 	i := 0
-	for ; ; i++ {
-		if !iterator.Valid() {
-			break
-		}
+	for ; iterator.Valid(); iterator.Next() {
 		addr := iterator.Key()[1:]
 		validator := types.MustUnmarshalValidator(k.cdc, addr, iterator.Value())
 		validators = append(validators, validator)
-		iterator.Next()
+		i++
 	}
 	iterator.Close()
 	return validators
 }
 
 // Get the set of all validators, retrieve a maxRetrieve number of records
-func (k Keeper) GetValidators(ctx sdk.Context, maxRetrieve int16) (validators []types.Validator) {
+func (k Keeper) GetValidators(ctx sdk.Context, maxRetrieve ...int16) (validators []types.Validator) {
+	if len(maxRetrieve) == 0 {
+		return k.GetAllValidators(ctx)
+	}
+	validators = make([]types.Validator, maxRetrieve[0])
+
 	store := ctx.KVStore(k.storeKey)
 	iterator := sdk.KVStorePrefixIterator(store, ValidatorsKey)
 
-	validators = make([]types.Validator, maxRetrieve)
 	i := 0
-	for ; ; i++ {
-		if !iterator.Valid() || i > int(maxRetrieve-1) {
-			break
-		}
+	for ; iterator.Valid() && i < int(maxRetrieve[0]); iterator.Next() {
 		addr := iterator.Key()[1:]
 		validator := types.MustUnmarshalValidator(k.cdc, addr, iterator.Value())
+
 		validators[i] = validator
-		iterator.Next()
+		i++
 	}
 	iterator.Close()
 	return validators[:i] // trim
@@ -123,7 +122,7 @@ func (k Keeper) GetValidatorsBonded(ctx sdk.Context) (validators []types.Validat
 		address := GetAddressFromValBondedIndexKey(iterator.Key())
 		validator, found := k.GetValidator(ctx, address)
 		if !found {
-			panic(fmt.Sprintf("validator record not found for address: %v\n", address))
+			panic(types.ErrNoValidatorFound(types.DefaultCodespace))
 		}
 
 		validators[i] = validator
@@ -142,20 +141,16 @@ func (k Keeper) GetValidatorsByPower(ctx sdk.Context) []types.Validator {
 	validators := make([]types.Validator, maxValidators)
 	iterator := sdk.KVStoreReversePrefixIterator(store, ValidatorsByPowerIndexKey) // largest to smallest
 	i := 0
-	for {
-		if !iterator.Valid() || i > int(maxValidators-1) {
-			break
-		}
+	for ; iterator.Valid() && i < int(maxValidators); iterator.Next() {
 		address := iterator.Value()
 		validator, found := k.GetValidator(ctx, address)
 		if !found {
-			panic(fmt.Sprintf("validator record not found for address: %v\n", address))
+			panic(types.ErrNoValidatorFound(types.DefaultCodespace))
 		}
 		if validator.Status == sdk.Bonded {
 			validators[i] = validator
 			i++
 		}
-		iterator.Next()
 	}
 	iterator.Close()
 	return validators[:i] // trim
@@ -412,7 +407,7 @@ func (k Keeper) UpdateBondedValidators(
 			var found bool
 			validator, found = k.GetValidator(ctx, ownerAddr)
 			if !found {
-				panic(fmt.Sprintf("validator record not found for address: %v\n", ownerAddr))
+				panic(types.ErrNoValidatorFound(types.DefaultCodespace))
 			}
 		}
 

x/stake/keeper/validator_test.go

@@ -43,7 +43,15 @@ func TestSetValidator(t *testing.T) {
 
 	resVals = keeper.GetValidatorsByPower(ctx)
 	require.Equal(t, 1, len(resVals))
-	assert.True(ValEq(t, validator, resVals[0]))
+	require.True(ValEq(t, validator, resVals[0]))
+
+	resVals = keeper.GetValidators(ctx)
+	require.Equal(t, 1, len(resVals))
+	require.True(ValEq(t, validator, resVals[0]))
+
+	resVals = keeper.GetValidators(ctx, 10)
+	require.Equal(t, 1, len(resVals))
+	require.True(ValEq(t, validator, resVals[0]))
 
 	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
@@ -265,7 +273,10 @@ func TestValidatorBasics(t *testing.T) {
 	_, found := keeper.GetValidator(ctx, addrVals[0])
 	require.False(t, found)
 	resVals := keeper.GetValidatorsBonded(ctx)
-	assert.Zero(t, len(resVals))
+	require.Zero(t, len(resVals))
+
+	resVals = keeper.GetValidators(ctx)
+	require.Zero(t, len(resVals))
 
 	pool = keeper.GetPool(ctx)
 	assert.True(sdk.DecEq(t, sdk.ZeroDec(), pool.BondedTokens))

x/stake/queryable.go

@@ -39,25 +39,23 @@ func NewQuerier(k keeper.Keeper) sdk.Querier {
 
 // Params for queries:
 // - 'custom/stake/delegator'
-// - 'custom/stake/delegator/txs'
-// - 'custom/stake/delegator/validators'
+// - 'custom/stake/delegatorValidators'
 // - 'custom/stake/validator'
 type QueryAddressParams struct {
-	accountAddr sdk.AccAddress
+	AccountAddr sdk.AccAddress
 }
 
 // Params for queries
-// - 'custom/stake/delegator/delegations'
-// - 'custom/stake/delegator/unbonding_delegations'
-// - 'custom/stake/delegator/validator'
+// - 'custom/stake/delegation'
+// - 'custom/stake/unbonding-delegation'
+// - 'custom/stake/delegatorValidator'
 type QueryBondsParams struct {
-	delegatorAddr sdk.AccAddress
-	validatorAddr sdk.AccAddress
+	DelegatorAddr sdk.AccAddress
+	ValidatorAddr sdk.AccAddress
 }
 
 func queryValidators(ctx sdk.Context, path []string, req abci.RequestQuery, k keeper.Keeper) (res []byte, err sdk.Error) {
-	validators := k.GetAllValidators(ctx)
-
+	validators := k.GetValidators(ctx)
 	res, errRes := wire.MarshalJSONIndent(k.Codec(), validators)
 	if err != nil {
 		panic(errRes.Error())
@@ -72,7 +70,7 @@ func queryValidator(ctx sdk.Context, path []string, req abci.RequestQuery, k kee
 		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data: \n%s", err.Error()))
 	}
 
-	validator, found := k.GetValidator(ctx, params.accountAddr)
+	validator, found := k.GetValidator(ctx, params.AccountAddr)
 	if !found {
 		return []byte{}, ErrNoValidatorFound(DefaultCodespace)
 	}
@@ -85,7 +83,7 @@ func queryValidator(ctx sdk.Context, path []string, req abci.RequestQuery, k kee
 }
 
 // TODO query with limit
-// func queryDelegator(ctx sdk.Context, path []string, req abci.RequestQuery, k keeper.Keeper) (res []byte, err sdk.Error) {
+// func queryDelegator(ctx sdk.Context, req abci.RequestQuery, k keeper.Keeper) (res []byte, err sdk.Error) {
 // 	var params QueryAddressParams
 // 	errRes := k.Codec().UnmarshalJSON(req.Data, &params)
 // 	if errRes != nil {
@@ -102,12 +100,13 @@ func queryValidator(ctx sdk.Context, path []string, req abci.RequestQuery, k kee
 // TODO query with limit
 func queryDelegatorValidators(ctx sdk.Context, path []string, req abci.RequestQuery, k keeper.Keeper) (res []byte, err sdk.Error) {
 	var params QueryAddressParams
+
 	errRes := k.Codec().UnmarshalJSON(req.Data, &params)
 	if errRes != nil {
 		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
-	validators := k.GetDelegatorValidators(ctx, params.accountAddr)
+	validators := k.GetDelegatorValidators(ctx, params.AccountAddr)
 
 	res, errRes = wire.MarshalJSONIndent(k.Codec(), validators)
 	if errRes != nil {
@@ -123,7 +122,7 @@ func queryDelegatorValidator(ctx sdk.Context, path []string, req abci.RequestQue
 		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
-	validator := k.GetDelegatorValidator(ctx, params.delegatorAddr, params.validatorAddr)
+	validator := k.GetDelegatorValidator(ctx, params.DelegatorAddr, params.ValidatorAddr)
 
 	res, errRes = wire.MarshalJSONIndent(k.Codec(), validator)
 	if errRes != nil {
@@ -139,7 +138,7 @@ func queryDelegation(ctx sdk.Context, path []string, req abci.RequestQuery, k ke
 		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
-	delegation, found := k.GetDelegation(ctx, params.delegatorAddr, params.validatorAddr)
+	delegation, found := k.GetDelegation(ctx, params.DelegatorAddr, params.ValidatorAddr)
 	if !found {
 		return []byte{}, ErrNoDelegation(DefaultCodespace)
 	}
@@ -158,7 +157,7 @@ func queryUnbondingDelegation(ctx sdk.Context, path []string, req abci.RequestQu
 		return []byte{}, sdk.ErrUnknownRequest(fmt.Sprintf("incorrectly formatted request data :\n%s", errRes.Error()))
 	}
 
-	unbond, found := k.GetUnbondingDelegation(ctx, params.delegatorAddr, params.validatorAddr)
+	unbond, found := k.GetUnbondingDelegation(ctx, params.DelegatorAddr, params.ValidatorAddr)
 	if !found {
 		return []byte{}, ErrNoUnbondingDelegation(DefaultCodespace)
 	}