@agoric/cosmos 0.34.2-dev-d61be8d.0 → 0.34.2-dev-624ac4a.0

package/git-revision.txt

@@ -1 +1 @@
-d61be8d
+624ac4a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-dev-d61be8d.0+d61be8d",
+  "version": "0.34.2-dev-624ac4a.0+624ac4a",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -38,5 +38,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "d61be8d7fbda7dd3846cba38f8829e36bfae92a4"
+  "gitHead": "624ac4ada84ea24a4d30428bde7a0bfa1d7b12bb"
 }

package/x/vstorage/README.md

@@ -37,22 +37,20 @@ This is used by the SwingSet "bridge".
  
 ## CLI
 
-A blockchain node may be interrogated by RPC using `agd [--node $url] query vstorage $command` via [client/cli](./client/cli/query.go).
-* `children [--height $blockHeight] [-o {text,json}] [$path]`
-* `data [--height $blockHeight] [-o {text,json}] $path`
+A blockchain node may be interrogated by RPC using `agd [--node $url] query vstorage path` via [client/cli](./client/cli/query.go). (See command help for options and variants `data` and `children`.)
 
 Examples:
 ```sh
-$ agd --node https://main.rpc.agoric.net:443/ query vstorage children published.reserve
+$ agd --node https://main.rpc.agoric.net:443/ query vstorage path published.reserve.
 children:
 - governance
 - metrics
 pagination: null
 
-$ agd --node https://main.rpc.agoric.net:443/ query vstorage children -o json published.reserve
+$ agd --node https://main.rpc.agoric.net:443/ query vstorage path -o json published.reserve.
 {"children":["governance","metrics"],"pagination":null}
 
-$ agd --node https://main.rpc.agoric.net:443/ query vstorage data published.reserve.metrics
+$ agd --node https://main.rpc.agoric.net:443/ query vstorage path published.reserve.metrics
 value: '{"blockHeight":"11030240","values":["{\"body\":\"#{\\\"allocations\\\":{\\\"Fee\\\":{\\\"brand\\\":\\\"$0.Alleged:
   IST brand\\\",\\\"value\\\":\\\"+20053582387\\\"}},\\\"shortfallBalance\\\":{\\\"brand\\\":\\\"$0\\\",\\\"value\\\":\\\"+0\\\"},\\\"totalFeeBurned\\\":{\\\"brand\\\":\\\"$0\\\",\\\"value\\\":\\\"+0\\\"},\\\"totalFeeMinted\\\":{\\\"brand\\\":\\\"$0\\\",\\\"value\\\":\\\"+0\\\"}}\",\"slots\":[\"board0257\"]}"]}'
 ```

package/x/vstorage/client/cli/query.go

@@ -4,6 +4,7 @@ import (
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/gogo/protobuf/proto"
 	"github.com/spf13/cobra"
 )
 
@@ -18,6 +19,7 @@ func GetQueryCmd(storeKey string) *cobra.Command {
 	swingsetQueryCmd.AddCommand(
 		GetCmdGetData(storeKey),
 		GetCmdGetChildren(storeKey),
+		GetCmdGetPath(storeKey),
 	)
 
 	return swingsetQueryCmd
@@ -86,3 +88,44 @@ func GetCmdGetChildren(queryRoute string) *cobra.Command {
 	flags.AddQueryFlagsToCmd(cmd)
 	return cmd
 }
+
+// GetCmdGetPath queries vstorage data or children, depending on the path
+func GetCmdGetPath(queryRoute string) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "path [path]",
+		Short: "get vstorage data, or children if path ends with '.'",
+		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)
+
+			path := args[0]
+
+			var res proto.Message
+
+			// if path ends with '.' then remove it and query children
+			if path[len(path)-1] == '.' {
+				path = path[:len(path)-1]
+				res, err = queryClient.Children(cmd.Context(), &types.QueryChildrenRequest{
+					Path: path,
+				})
+			} else {
+				res, err = queryClient.Data(cmd.Context(), &types.QueryDataRequest{
+					Path: path,
+				})
+			}
+
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	return cmd
+}