Merge branch 'master' into vincent-search-txs-flags

CHANGELOG.md

@@ -57,6 +57,7 @@ if input key is empty, or input data contains empty key.
 * [\#9133](https://github.com/cosmos/cosmos-sdk/pull/9133) Added hooks for governance actions.
 * (x/staking) [\#9214](https://github.com/cosmos/cosmos-sdk/pull/9214) Added `new_shares` attribute inside `EventTypeDelegate` event.
 * [\#9382](https://github.com/cosmos/cosmos-sdk/pull/9382) feat: add Dec.Float64() function.
+* [\#9429](https://github.com/cosmos/cosmos-sdk/pull/9429) Add `cosmos_sdk_version` to node_info
 * [\#9457](https://github.com/cosmos/cosmos-sdk/pull/9457) Add amino support for x/authz and x/feegrant Msgs.
 * [\#9498](https://github.com/cosmos/cosmos-sdk/pull/9498) Added `Codec: codec.Codec` attribute to `client/Context` structure.
 

CONTRIBUTING.md

@@ -75,12 +75,13 @@ of how these are written refer to the current [ADRs](https://github.com/cosmos/c
 PRs should be categorically broken up based on the type of changes being made (i.e. `fix`, `feat`,
 `refactor`, `docs`, etc.). The *type* must be included in the PR title as a prefix (e.g.
 `fix: <description>`). This ensures that all changes committed to the base branch follow the
-[Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification. 
+[Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
 Additionally, each PR should only address a single issue.
 
 ### Pull Request Templates
 
 There are currently three PR templates. The [default template](./.github/PULL_REQUEST_TEMPLATE.md) is for types `fix`, `feat`, and `refactor`. We also have a [docs template](./.github/PULL_REQUEST_TEMPLATE/docs.md) for documentation changes and an [other template](./.github/PULL_REQUEST_TEMPLATE/other.md) for changes that do not affect production code. When previewing a PR before it has been opened, you can change the template by adding one of the following parameters to the url:
+
 - `template=docs.md`
 - `template=other.md`
 

client/grpc/tmservice/service.go

@@ -184,13 +184,14 @@ func (s queryServer) GetNodeInfo(ctx context.Context, req *GetNodeInfoRequest) (
 	resp := GetNodeInfoResponse{
 		DefaultNodeInfo: protoNodeInfo,
 		ApplicationVersion: &VersionInfo{
-			AppName:   nodeInfo.AppName,
-			Name:      nodeInfo.Name,
-			GitCommit: nodeInfo.GitCommit,
-			GoVersion: nodeInfo.GoVersion,
-			Version:   nodeInfo.Version,
-			BuildTags: nodeInfo.BuildTags,
-			BuildDeps: deps,
+			AppName:          nodeInfo.AppName,
+			Name:             nodeInfo.Name,
+			GitCommit:        nodeInfo.GitCommit,
+			GoVersion:        nodeInfo.GoVersion,
+			Version:          nodeInfo.Version,
+			BuildTags:        nodeInfo.BuildTags,
+			BuildDeps:        deps,
+			CosmosSdkVersion: nodeInfo.CosmosSdkVersion,
 		},
 	}
 	return &resp, nil

docs/core/proto-docs.md

@@ -1308,7 +1308,7 @@ MsgExecResponse defines the Msg/MsgExecResponse response type.
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `result` | [cosmos.base.abci.v1beta1.Result](#cosmos.base.abci.v1beta1.Result) |  |  |
+| `results` | [bytes](#bytes) | repeated |  |
 
 
 
@@ -3015,6 +3015,7 @@ VersionInfo is the type for the GetNodeInfoResponse message.
 | `build_tags` | [string](#string) |  |  |
 | `go_version` | [string](#string) |  |  |
 | `build_deps` | [Module](#cosmos.base.tendermint.v1beta1.Module) | repeated |  |
+| `cosmos_sdk_version` | [string](#string) |  |  |
 
 
 

go.mod

@@ -44,7 +44,7 @@ require (
 	github.com/tendermint/btcd v0.1.1
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
 	github.com/tendermint/go-amino v0.16.0
-	github.com/tendermint/tendermint v0.34.10
+	github.com/tendermint/tendermint v0.34.11
 	github.com/tendermint/tm-db v0.6.4
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c

go.sum

@@ -750,8 +750,9 @@ github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoM
 github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4=
 github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg=
 github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ=
-github.com/tendermint/tendermint v0.34.10 h1:wBOc/It8sh/pVH9np2V5fBvRmIyFN/bUrGPx+eAHexs=
 github.com/tendermint/tendermint v0.34.10/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
+github.com/tendermint/tendermint v0.34.11 h1:q1Yh76oG4QbS07xhmIJh5iAE0fYpJ8P8YKYtjnWfJRY=
+github.com/tendermint/tendermint v0.34.11/go.mod h1:aeHL7alPh4uTBIJQ8mgFEE8VwJLXI1VD3rVOmH2Mcy0=
 github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI=
 github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8=
 github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ=

proto/cosmos/authz/v1beta1/tx.proto

@@ -40,7 +40,7 @@ message MsgGrant {
 
 // MsgExecResponse defines the Msg/MsgExecResponse response type.
 message MsgExecResponse {
-  cosmos.base.abci.v1beta1.Result result = 1;
+  repeated bytes results = 1;
 }
 
 // MsgExec attempts to execute the provided messages using

proto/cosmos/base/tendermint/v1beta1/query.proto

@@ -116,13 +116,14 @@ message GetNodeInfoResponse {
 
 // VersionInfo is the type for the GetNodeInfoResponse message.
 message VersionInfo {
-  string          name       = 1;
-  string          app_name   = 2;
-  string          version    = 3;
-  string          git_commit = 4;
-  string          build_tags = 5;
-  string          go_version = 6;
-  repeated Module build_deps = 7;
+  string          name               = 1;
+  string          app_name           = 2;
+  string          version            = 3;
+  string          git_commit         = 4;
+  string          build_tags         = 5;
+  string          go_version         = 6;
+  repeated Module build_deps         = 7;
+  string          cosmos_sdk_version = 8;
 }
 
 // Module is the type for VersionInfo

version/version.go

@@ -36,26 +36,44 @@ var (
 	BuildTags = ""
 )
 
+func getSDKVersion() string {
+	deps, ok := debug.ReadBuildInfo()
+	if !ok {
+		return "unable to read deps"
+	}
+	var sdkVersion string
+	for _, dep := range deps.Deps {
+		if dep.Path == "github.com/cosmos/cosmos-sdk" {
+			sdkVersion = dep.Version
+		}
+	}
+
+	return sdkVersion
+}
+
 // Info defines the application version information.
 type Info struct {
-	Name      string     `json:"name" yaml:"name"`
-	AppName   string     `json:"server_name" yaml:"server_name"`
-	Version   string     `json:"version" yaml:"version"`
-	GitCommit string     `json:"commit" yaml:"commit"`
-	BuildTags string     `json:"build_tags" yaml:"build_tags"`
-	GoVersion string     `json:"go" yaml:"go"`
-	BuildDeps []buildDep `json:"build_deps" yaml:"build_deps"`
+	Name             string     `json:"name" yaml:"name"`
+	AppName          string     `json:"server_name" yaml:"server_name"`
+	Version          string     `json:"version" yaml:"version"`
+	GitCommit        string     `json:"commit" yaml:"commit"`
+	BuildTags        string     `json:"build_tags" yaml:"build_tags"`
+	GoVersion        string     `json:"go" yaml:"go"`
+	BuildDeps        []buildDep `json:"build_deps" yaml:"build_deps"`
+	CosmosSdkVersion string     `json:"cosmos_sdk_version" yaml:"cosmos_sdk_version"`
 }
 
 func NewInfo() Info {
+	sdkVersion := getSDKVersion()
 	return Info{
-		Name:      Name,
-		AppName:   AppName,
-		Version:   Version,
-		GitCommit: Commit,
-		BuildTags: BuildTags,
-		GoVersion: fmt.Sprintf("go version %s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH),
-		BuildDeps: depsFromBuildInfo(),
+		Name:             Name,
+		AppName:          AppName,
+		Version:          Version,
+		GitCommit:        Commit,
+		BuildTags:        BuildTags,
+		GoVersion:        fmt.Sprintf("go version %s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH),
+		BuildDeps:        depsFromBuildInfo(),
+		CosmosSdkVersion: sdkVersion,
 	}
 }
 

version/version_test.go

@@ -25,12 +25,13 @@ build tags:
 
 func TestInfo_String(t *testing.T) {
 	info := version.Info{
-		Name:      "testapp",
-		AppName:   "testappd",
-		Version:   "1.0.0",
-		GitCommit: "1b78457135a4104bc3af97f20654d49e2ea87454",
-		BuildTags: "netgo,ledger",
-		GoVersion: "go version go1.14 linux/amd64",
+		Name:             "testapp",
+		AppName:          "testappd",
+		Version:          "1.0.0",
+		GitCommit:        "1b78457135a4104bc3af97f20654d49e2ea87454",
+		BuildTags:        "netgo,ledger",
+		GoVersion:        "go version go1.14 linux/amd64",
+		CosmosSdkVersion: "0.42.5",
 	}
 	want := `testapp: 1.0.0
 git commit: 1b78457135a4104bc3af97f20654d49e2ea87454

x/authz/keeper/keeper.go

@@ -72,10 +72,9 @@ func (k Keeper) update(ctx sdk.Context, grantee sdk.AccAddress, granter sdk.AccA
 
 // DispatchActions attempts to execute the provided messages via authorization
 // grants from the message signer to the grantee.
-func (k Keeper) DispatchActions(ctx sdk.Context, grantee sdk.AccAddress, msgs []sdk.Msg) (*sdk.Result, error) {
-	var msgResult *sdk.Result
-	var err error
-	for _, msg := range msgs {
+func (k Keeper) DispatchActions(ctx sdk.Context, grantee sdk.AccAddress, msgs []sdk.Msg) ([][]byte, error) {
+	var results = make([][]byte, len(msgs))
+	for i, msg := range msgs {
 		signers := msg.GetSigners()
 		if len(signers) != 1 {
 			return nil, sdkerrors.ErrInvalidRequest.Wrap("authorization can be given to msg with only one signer")
@@ -103,19 +102,20 @@ func (k Keeper) DispatchActions(ctx sdk.Context, grantee sdk.AccAddress, msgs []
 				return nil, sdkerrors.ErrUnauthorized
 			}
 		}
-		handler := k.router.Handler(msg)
 
+		handler := k.router.Handler(msg)
 		if handler == nil {
 			return nil, sdkerrors.ErrUnknownRequest.Wrapf("unrecognized message route: %s", sdk.MsgTypeURL(msg))
 		}
 
-		msgResult, err = handler(ctx, msg)
+		msgResp, err := handler(ctx, msg)
 		if err != nil {
 			return nil, sdkerrors.Wrapf(err, "failed to execute message; message %v", msg)
 		}
+		results[i] = msgResp.Data
 	}
 
-	return msgResult, nil
+	return results, nil
 }
 
 // SaveGrant method grants the provided authorization to the grantee on the granter's account

x/authz/keeper/msg_server.go

@@ -70,9 +70,9 @@ func (k Keeper) Exec(goCtx context.Context, msg *authz.MsgExec) (*authz.MsgExecR
 	if err != nil {
 		return nil, err
 	}
-	result, err := k.DispatchActions(ctx, grantee, msgs)
+	results, err := k.DispatchActions(ctx, grantee, msgs)
 	if err != nil {
 		return nil, err
 	}
-	return &authz.MsgExecResponse{Result: result}, nil
+	return &authz.MsgExecResponse{Results: results}, nil
 }