Add missing queries CLI

x/interchainstaking/client/cli/query.go

@@ -30,6 +30,15 @@
 		GetDelegatorIntentCmd(),
 		GetDepositAccountCmd(),
 		GetMappedAccountsCmd(),
+		GetWithdrawalRecordsCmd(),
+		GetUserWithdrawalRecordsCmd(),
+		GetZoneWithdrawalRecords(),
+		GetUnbondingRecordsCmd(),
+		GetReceiptsCmd(),
+		GetTxStatusCmd(),
+		GetZoneRedelegationRecordsCmd(),
+		GetZoneValidatorsCmd(),
+		GetZoneCmd(),
 	)
 
 	return cmd
@@ -180,3 +189,306 @@
 
 	return cmd
 }
+
+func GetWithdrawalRecordsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "withdrawal-records",
+		Short: "Query all withdrawal records",
+		Example: strings.TrimSpace(
+			fmt.Sprintf(`$ %s query interchainstaking withdrawal-records`,
+				version.AppName,
+			)),
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			req := &types.QueryWithdrawalRecordsRequest{
+				Pagination: pageReq,
+			}
+
+			res, err := queryClient.WithdrawalRecords(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func GetUserWithdrawalRecordsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "user-withdrawal-record [user-address]",
+		Short: "Query withdrawal record for a given address.",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			// args
+			address := args[0]
+
+			queryClient := types.NewQueryClient(clientCtx)
+			req := &types.QueryUserWithdrawalRecordsRequest{
+				UserAddress: address,
+			}
+
+			res, err := queryClient.UserWithdrawalRecords(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+func GetZoneWithdrawalRecords() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "zone-withdrawal-records [chain-id]",
+		Short: "Query withdrawal records for a given zone.",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			// args
+			chainID := args[0]
+
+			queryClient := types.NewQueryClient(clientCtx)
+			req := &types.QueryWithdrawalRecordsRequest{
+				ChainId: chainID,
+			}
+
+			res, err := queryClient.ZoneWithdrawalRecords(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+func GetUnbondingRecordsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "unbonding-records",
+		Short: "Query all unbonding records",
+		Example: strings.TrimSpace(
+			fmt.Sprintf(`$ %s query interchainstaking unbonding-records`,
+				version.AppName,
+			)),
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			req := &types.QueryUnbondingRecordsRequest{
+				Pagination: pageReq,
+			}
+
+			res, err := queryClient.UnbondingRecords(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+func GetReceiptsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "recepts",
+		Short: "Query all receipts",
+		Example: strings.TrimSpace(
+			fmt.Sprintf(`$ %s query interchainstaking receipts`,
+				version.AppName,
+			)),
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			pageReq, err := client.ReadPageRequest(cmd.Flags())
+			if err != nil {
+				return err
+			}
+
+			req := &types.QueryReceiptsRequest{
+				Pagination: pageReq,
+			}
+
+			res, err := queryClient.Receipts(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+func GetTxStatusCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "tx-status [chain-id] [tx-hash]",
+		Short: "Query the status of a transaction",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			chainID := args[0]
+			txHash := args[1]
+
+			queryClient := types.NewQueryClient(clientCtx)
+			req := &types.QueryTxStatusRequest{
+				ChainId: chainID,
+				TxHash:  txHash,
+			}
+
+			res, err := queryClient.TxStatus(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+func GetZoneRedelegationRecordsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "zone-redelegation-records",
+		Short: "Query re-delegation records for a given zone.",
+		Example: strings.TrimSpace(
+			fmt.Sprintf(`$ %s query interchainstaking zone-redelegation-records`,
+				version.AppName,
+			)),
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			chainID := args[0]
+			req := &types.QueryRedelegationRecordsRequest{
+				ChainId: chainID,
+			}
+
+			// TODO: refactor this. Should be RedelegationRecords
+			res, err := queryClient.RedelegationRecords(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+// GetZoneValidatorCmd returns the validators for the given zone.
+func GetZoneValidatorsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "zone-validators",
+		Short: "Query validators for a given zone.",
+		Example: strings.TrimSpace(
+			fmt.Sprintf(`$ %s query interchainstaking zone-validators`,
+				version.AppName,
+			)),
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			req := &types.QueryZoneValidatorsRequest{}
+
+			res, err := queryClient.ZoneValidators(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}
+
+// GetZoneCmd returns the information about the zone.
+func GetZoneCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "zone [chain-id]",
+		Short: "Query zone information for a given chain.",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			chainID := args[0]
+
+			queryClient := types.NewQueryClient(clientCtx)
+			req := &types.QueryZoneRequest{
+				ChainId: chainID,
+			}
+
+			res, err := queryClient.Zone(cmd.Context(), req)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}

x/interchainstaking/keeper/grpc_query.go

@@ -244,19 +244,12 @@
 	}
 
 	ctx := sdk.UnwrapSDKContext(c)
-
-	zone, found := k.GetZone(ctx, req.GetChainId())
+	_, found := k.GetZone(ctx, req.ChainId)
 	if !found {
 		return nil, status.Error(codes.NotFound, fmt.Sprintf("no zone found matching %s", req.GetChainId()))
 	}
 
-	withdrawalrecords := make([]types.WithdrawalRecord, 0)
-	k.IterateZoneWithdrawalRecords(ctx, zone.ChainId, func(index int64, record types.WithdrawalRecord) (stop bool) {
-		if record.Delegator == req.DelegatorAddress {
-			withdrawalrecords = append(withdrawalrecords, record)
-		}
-		return false
-	})
+	withdrawalrecords := k.AllZoneWithdrawalRecords(ctx, req.ChainId)
 
 	return &types.QueryWithdrawalRecordsResponse{Withdrawals: withdrawalrecords}, nil
 }
@@ -269,7 +262,7 @@
 
 	ctx := sdk.UnwrapSDKContext(c)
 
-	withdrawalrecords := k.AllZoneWithdrawalRecords(ctx, req.ChainId)
+	withdrawalrecords := k.AllWithdrawalRecords(ctx)
 
 	return &types.QueryWithdrawalRecordsResponse{Withdrawals: withdrawalrecords}, nil
 }
@@ -304,6 +297,7 @@
 	return &types.QueryUnbondingRecordsResponse{Unbondings: unbondings}, nil
 }
 
+// TODO: refactor this. Should be ZoneRedelegationRecords since it's only for a specific zone
 func (k *Keeper) RedelegationRecords(c context.Context, req *types.QueryRedelegationRecordsRequest) (*types.QueryRedelegationRecordsResponse, error) {
 	// TODO: implement pagination
 	if req == nil {

x/interchainstaking/keeper/redelegation_record.go

@@ -66,7 +66,7 @@ func (k *Keeper) IterateRedelegationRecords(ctx sdk.Context, fn func(index int64
 	k.IteratePrefixedRedelegationRecords(ctx, nil, fn)
 }
 
-// AllRedelegationRecords returns every record in the store for the specified zone.
+// AllRedelegationRecords returns every record in the store
 func (k *Keeper) AllRedelegationRecords(ctx sdk.Context) []types.RedelegationRecord {
 	records := []types.RedelegationRecord{}
 	k.IterateRedelegationRecords(ctx, func(_ int64, _ []byte, record types.RedelegationRecord) (stop bool) {