feat: fix queries #2209
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ func NewQueryCmd() *cobra.Command { | |
| cmd.AddCommand(CmdProviderValidatorKey()) | ||
| cmd.AddCommand(CmdThrottleState()) | ||
| cmd.AddCommand(CmdRegisteredConsumerRewardDenoms()) | ||
| cmd.AddCommand(CmdAllPairsValConsAddrByConsumer()) | ||
| cmd.AddCommand(CmdProviderParameters()) | ||
| cmd.AddCommand(CmdConsumerChainOptedInValidators()) | ||
| cmd.AddCommand(CmdConsumerValidators()) | ||
|
|
@@ -78,7 +78,7 @@ func CmdConsumerChains() *cobra.Command { | |
| Short: "Query consumer chains for provider chain.", | ||
| Long: `Query consumer chains for provider chain. An optional | ||
| integer parameter can be passed for phase filtering of consumer chains, | ||
| (All=0|Registered=1|Initialized=2|Launched=3|Stopped=4).`, | ||
mpoke marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Args: cobra.MaximumNArgs(2), | ||
| RunE: func(cmd *cobra.Command, args []string) (err error) { | ||
| clientCtx, err := client.GetClientQueryContext(cmd) | ||
|
|
@@ -123,13 +123,13 @@ func CmdConsumerChains() *cobra.Command { | |
| func CmdConsumerValidatorKeyAssignment() *cobra.Command { | ||
| bech32PrefixConsAddr := sdk.GetConfig().GetBech32ConsensusAddrPrefix() | ||
| cmd := &cobra.Command{ | ||
| Use: "validator-consumer-key [consumerId] [provider-validator-address]", | ||
| Short: "Query assigned validator consensus public key for a consumer chain", | ||
| Long: strings.TrimSpace( | ||
| fmt.Sprintf(`Returns the currently assigned validator consensus public key for a | ||
| consumer chain, if one has been assigned. | ||
| Example: | ||
| $ %s query provider validator-consumer-key 3 %s1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj | ||
| `, | ||
| version.AppName, bech32PrefixConsAddr, | ||
| ), | ||
|
|
@@ -285,10 +285,10 @@ $ %s query provider registered-consumer-reward-denoms | |
| return cmd | ||
| } | ||
|
|
||
| func CmdAllPairsValConsAddrByConsumer() *cobra.Command { | ||
mpoke marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| cmd := &cobra.Command{ | ||
| Use: "all-pairs-valconsensus-address [consumer-id]", | ||
| Short: "Query all pairs of valconsensus address by consumer ID.", | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| clientCtx, err := client.GetClientQueryContext(cmd) | ||
|
|
@@ -297,8 +297,8 @@ func CmdAllPairsValConAddrByConsumerChainID() *cobra.Command { | |
| } | ||
| queryClient := types.NewQueryClient(clientCtx) | ||
|
|
||
| req := types.QueryAllPairsValConsAddrByConsumerRequest{ConsumerId: args[0]} | ||
| res, err := queryClient.QueryAllPairsValConsAddrByConsumer(cmd.Context(), &req) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -346,15 +346,15 @@ $ %s query provider params | |
| return cmd | ||
| } | ||
|
|
||
| // Command to query opted-in validators by consumer ID | ||
| func CmdConsumerChainOptedInValidators() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "consumer-opted-in-validators [consumer-id]", | ||
| Short: "Query opted-in validators for a given consumer chain", | ||
| Long: strings.TrimSpace( | ||
| fmt.Sprintf(`Query opted-in validators for a given consumer chain. | ||
| Example: | ||
| $ %s consumer-opted-in-validators 3 | ||
| `, version.AppName), | ||
| ), | ||
| Args: cobra.ExactArgs(1), | ||
|
|
@@ -380,16 +380,16 @@ $ %s consumer-opted-in-validators foochain | |
| return cmd | ||
| } | ||
|
|
||
| // Command to query the consumer validators by consumer ID | ||
| func CmdConsumerValidators() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "consumer-validators [consumer-id]", | ||
| Short: "Query the last set consumer-validator set for a given consumer chain", | ||
| Long: strings.TrimSpace( | ||
| fmt.Sprintf(`Query the last set consumer-validator set for a given consumer chain. | ||
| Note that this does not necessarily mean that the consumer chain is currently using this validator set because a VSCPacket could be delayed, etc. | ||
| Example: | ||
| $ %s consumer-validators 3 | ||
| `, version.AppName), | ||
| ), | ||
| Args: cobra.ExactArgs(1), | ||
|
|
@@ -462,12 +462,12 @@ $ %s has-to-validate %s1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj | |
| func CmdValidatorConsumerCommissionRate() *cobra.Command { | ||
| bech32PrefixConsAddr := sdk.GetConfig().GetBech32ConsensusAddrPrefix() | ||
| cmd := &cobra.Command{ | ||
| Use: "validator-consumer-commission-rate [consumer-id] [provider-validator-address]", | ||
| Short: "Query the consumer commission rate a validator charges on a consumer chain", | ||
| Long: strings.TrimSpace( | ||
| fmt.Sprintf(`Query the consumer commission rate a validator charges on a consumer chain. | ||
| Example: | ||
| $ %s validator-consumer-commission-rate 3 %s1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj | ||
| `, version.AppName, bech32PrefixConsAddr), | ||
| ), | ||
| Args: cobra.ExactArgs(2), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,14 +5,12 @@ import ( | |
| "context" | ||
| "fmt" | ||
| "sort" | ||
|
|
||
| "google.golang.org/grpc/codes" | ||
| "google.golang.org/grpc/status" | ||
|
|
||
| errorsmod "cosmossdk.io/errors" | ||
|
|
||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" | ||
| ccvtypes "github.com/cosmos/interchain-security/v5/x/ccv/types" | ||
|
|
@@ -51,31 +49,13 @@ func (k Keeper) QueryConsumerChains(goCtx context.Context, req *types.QueryConsu | |
| ctx := sdk.UnwrapSDKContext(goCtx) | ||
|
|
||
| consumerIds := []string{} | ||
| for _, consumerID := range k.GetAllConsumerIds(ctx) { | ||
| phase := k.GetConsumerPhase(ctx, consumerID) | ||
| if req.Phase != types.ConsumerPhase_CONSUMER_PHASE_UNSPECIFIED && req.Phase != phase { | ||
| // ignore consumer chain | ||
| continue | ||
| } | ||
| consumerIds = append(consumerIds, consumerID) | ||
| } | ||
|
|
||
| // set limit to default value | ||
|
|
@@ -84,12 +64,12 @@ func (k Keeper) QueryConsumerChains(goCtx context.Context, req *types.QueryConsu | |
| // update limit if specified | ||
| limit = int(req.Limit) | ||
| } | ||
| if len(consumerIds) > limit { | ||
| consumerIds = consumerIds[:limit] | ||
| } | ||
|
|
||
| chains := make([]*types.Chain, len(consumerIds)) | ||
| for i, cID := range consumerIds { | ||
| c, err := k.GetConsumerChain(ctx, cID) | ||
| if err != nil { | ||
| return nil, status.Error(codes.Internal, err.Error()) | ||
|
|
@@ -108,6 +88,7 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, consumerId string) (types.Chai | |
| } | ||
|
|
||
| clientID, _ := k.GetConsumerClientId(ctx, consumerId) | ||
|
|
||
| powerShapingParameters, err := k.GetConsumerPowerShapingParameters(ctx, consumerId) | ||
| if err != nil { | ||
| return types.Chain{}, fmt.Errorf("cannot find power shaping parameters for consumer (%s): %s", consumerId, err.Error()) | ||
|
|
@@ -116,15 +97,9 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, consumerId string) (types.Chai | |
| // Get the minimal power in the top N for the consumer chain | ||
| minPowerInTopN, found := k.GetMinimumPowerInTopN(ctx, consumerId) | ||
| if !found { | ||
| minPowerInTopN = -1 | ||
| } | ||
|
|
||
| allowlist := k.GetAllowList(ctx, consumerId) | ||
| strAllowlist := make([]string, len(allowlist)) | ||
| for i, addr := range allowlist { | ||
|
|
@@ -148,10 +123,11 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, consumerId string) (types.Chai | |
| ValidatorsPowerCap: powerShapingParameters.ValidatorsPowerCap, | ||
| Allowlist: strAllowlist, | ||
| Denylist: strDenylist, | ||
| Phase: k.GetConsumerPhase(ctx, consumerId).String(), | ||
| Metadata: metadata, | ||
| AllowInactiveVals: powerShapingParameters.AllowInactiveVals, | ||
| MinStake: powerShapingParameters.MinStake, | ||
| ConsumerId: consumerId, | ||
| }, nil | ||
| } | ||
|
|
||
|
|
@@ -243,7 +219,10 @@ func (k Keeper) QueryRegisteredConsumerRewardDenoms(goCtx context.Context, req * | |
| }, nil | ||
| } | ||
|
|
||
| func (k Keeper) QueryAllPairsValConsAddrByConsumer( | ||
| goCtx context.Context, | ||
| req *types.QueryAllPairsValConsAddrByConsumerRequest, | ||
| ) (*types.QueryAllPairsValConsAddrByConsumerResponse, error) { | ||
| if req == nil { | ||
| return nil, status.Errorf(codes.InvalidArgument, "empty request") | ||
| } | ||
|
|
@@ -270,7 +249,7 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, | |
| }) | ||
| } | ||
|
|
||
| return &types.QueryAllPairsValConsAddrByConsumerResponse{ | ||
| PairValConAddr: pairValConAddrs, | ||
| }, nil | ||
| } | ||
|
|
@@ -445,14 +424,14 @@ func (k Keeper) QueryConsumerChainsValidatorHasToValidate(goCtx context.Context, | |
| // get all the consumer chains for which the validator is either already | ||
| // opted-in, currently a consumer validator or if its voting power is within the TopN validators | ||
| consumersToValidate := []string{} | ||
| for _, consumerId := range k.GetAllLaunchedConsumerIds(ctx) { | ||
| if hasToValidate, err := k.hasToValidate(ctx, provAddr, consumerId); err == nil && hasToValidate { | ||
| consumersToValidate = append(consumersToValidate, consumerId) | ||
| } | ||
| } | ||
|
|
||
| return &types.QueryConsumerChainsValidatorHasToValidateResponse{ | ||
| ConsumerIds: consumersToValidate, | ||
| }, nil | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: why not use
QueryAllPairsValConsAddrByConsumerID?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because it's too long of a name for something that doesn't matter. Nobody really uses this name. The relevant parts are the REST endpoint or CLI command.