query methods

x/upgrade/client/cli/query.go

@@ -20,6 +20,7 @@ func GetQueryCmd() *cobra.Command {
 	cmd.AddCommand(
 		GetCurrentPlanCmd(),
 		GetAppliedPlanCmd(),
+		GetVersionMapCmd(),
 	)
 
 	return cmd
@@ -110,3 +111,36 @@ func GetAppliedPlanCmd() *cobra.Command {
 
 	return cmd
 }
+
+// GetVersionMapCmd returns the version map from state
+func GetVersionMapCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "versionmap",
+		Short: "get the version map",
+		Long:  "Gets the map of module names to consensus versions",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+			queryClient := types.NewQueryClient(clientCtx)
+
+			params := types.QueryVersionMap{}
+			res, err := queryClient.VersionMap(cmd.Context(), &params)
+			if err != nil {
+				return err
+			}
+
+			if res.VersionMap == nil {
+				return fmt.Errorf("no version map in state")
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}

x/upgrade/client/rest/query.go

@@ -2,12 +2,14 @@ package rest
 
 import (
 	"encoding/binary"
+	"encoding/json"
 	"fmt"
 	"net/http"
 
 	"github.com/gorilla/mux"
 
 	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
@@ -19,6 +21,9 @@ func registerQueryRoutes(clientCtx client.Context, r *mux.Router) {
 	r.HandleFunc(
 		"/upgrade/applied/{name}", getDonePlanHandler(clientCtx),
 	).Methods("GET")
+	r.HandleFunc(
+		"/upgrade/versionmap", getVersionMap(clientCtx),
+	)
 }
 
 func getCurrentPlanHandler(clientCtx client.Context) func(http.ResponseWriter, *http.Request) {
@@ -71,3 +76,32 @@ func getDonePlanHandler(clientCtx client.Context) func(http.ResponseWriter, *htt
 		rest.PostProcessResponse(w, clientCtx, applied)
 	}
 }
+
+func getVersionMap(clientCtx client.Context) func(http.ResponseWriter, *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		req := types.QueryVersionMap{}
+		bz, err := clientCtx.LegacyAmino.MarshalJSON(req)
+		if rest.CheckBadRequestError(w, err) {
+			return
+		}
+
+		res, _, err := clientCtx.QueryWithData(fmt.Sprintf("custom/%s/%s", types.QuerierKey, types.QueryVM), bz)
+		if rest.CheckBadRequestError(w, err) {
+			return
+		}
+
+		if len(res) == 0 {
+			http.NotFound(w, r)
+			return
+		}
+		if len(res) != 8 {
+			rest.WriteErrorResponse(w, http.StatusInternalServerError, "unknown format for applied-upgrade")
+		}
+
+		vm := make(module.VersionMap)
+		err = json.Unmarshal(res, &vm)
+		fmt.Println(vm)
+		rest.PostProcessResponse(w, clientCtx, vm)
+	}
+}

x/upgrade/keeper/grpc_query_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
@@ -141,6 +142,22 @@ func (suite *UpgradeTestSuite) TestAppliedCurrentPlan() {
 	}
 }
 
+func (suite *UpgradeTestSuite) TestVersionMap() {
+
+	var req *types.QueryVersionMap
+
+	req = &types.QueryVersionMap{}
+
+	suite.SetupTest() // reset
+	res, err := suite.queryClient.VersionMap(gocontext.Background(), req)
+	require.NoError(suite.T(), err)
+	appVM := suite.app.UpgradeKeeper.GetModuleVersionMap(suite.ctx)
+	require.Equal(suite.T(), len(appVM), len(res.VersionMap))
+	for module := range res.VersionMap {
+		require.Equal(suite.T(), appVM[module], res.VersionMap[module])
+	}
+}
+
 func TestUpgradeTestSuite(t *testing.T) {
 	suite.Run(t, new(UpgradeTestSuite))
 }

x/upgrade/types/querier.go

@@ -4,4 +4,5 @@ package types
 const (
 	QueryCurrent = "current"
 	QueryApplied = "applied"
+	QueryVM      = "versionmap"
 )