Merge branch 'master' into sunny/change-pubkey-adr

swelf19 · Nov 24, 2020 · dc9d36b · dc9d36b
2 parents b5442e1 + 12a02b9
commit dc9d36b
Show file tree

Hide file tree

Showing 146 changed files with 4,816 additions and 3,231 deletions.
diff --git a/baseapp/abci.go b/baseapp/abci.go
@@ -382,6 +382,11 @@ func (app *BaseApp) snapshot(height int64) {
 func (app *BaseApp) Query(req abci.RequestQuery) abci.ResponseQuery {
 	defer telemetry.MeasureSince(time.Now(), "abci", "query")
 
+	// when a client did not provide a query height, manually inject the latest
+	if req.Height == 0 {
+		req.Height = app.LastBlockHeight()
+	}
+
 	// handle gRPC routes first rather than calling splitPath because '/' characters
 	// are used as part of gRPC paths
 	if grpcHandler := app.grpcQueryRouter.Route(req.Path); grpcHandler != nil {
@@ -742,11 +747,6 @@ func handleQueryStore(app *BaseApp, path []string, req abci.RequestQuery) abci.R
 
 	req.Path = "/" + strings.Join(path[1:], "/")
 
-	// when a client did not provide a query height, manually inject the latest
-	if req.Height == 0 {
-		req.Height = app.LastBlockHeight()
-	}
-
 	if req.Height <= 1 && req.Prove {
 		return sdkerrors.QueryResult(
 			sdkerrors.Wrap(