fix!: update ABCI query to use request height

CHANGELOG.md

@@ -68,6 +68,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Client Breaking Changes
 
+* [\#9879](https://github.com/cosmos/cosmos-sdk/pull/9879) Modify ABCI Queries to use `abci.QueryRequest` Height field instead of context height.
 * [\#9859](https://github.com/cosmos/cosmos-sdk/pull/9859) The `default` pruning strategy now keeps the last 362880 blocks instead of 100. 362880 equates to roughly enough blocks to cover the entire unbonding period assuming a 21 day unbonding period and 5s block time.
 * [\#9594](https://github.com/cosmos/cosmos-sdk/pull/9594) Remove legacy REST API. Please see the [REST Endpoints Migration guide](https://docs.cosmos.network/master/migrations/rest.html) to migrate to the new REST endpoints.
 * [\#9781](https://github.com/cosmos/cosmos-sdk/pull/9781) Improve`withdraw-all-rewards` UX when broadcast mode `async` or `async` is used.

client/query.go

@@ -77,7 +77,7 @@ func (ctx Context) queryABCI(req abci.RequestQuery) (abci.ResponseQuery, error)
 	}
 
 	opts := rpcclient.ABCIQueryOptions{
-		Height: ctx.Height,
+		Height: req.Height,
 		Prove:  req.Prove,
 	}
 

client/query_test.go

@@ -0,0 +1,35 @@
+// +build norace
+
+package client_test
+
+import (
+	"fmt"
+
+	abci "github.com/tendermint/tendermint/abci/types"
+
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+)
+
+func (s *IntegrationTestSuite) TestQueryABCIHeight() {
+	// test ABCI query uses request height argument
+	// instead of client context height
+	contextHeight := 1 // query at height 1 or 2 would cause an error
+	reqHeight := int64(10)
+
+	val := s.network.Validators[0]
+	clientCtx := val.ClientCtx
+	clientCtx = clientCtx.WithHeight(contextHeight)
+
+	req := abci.RequestQuery{
+		Path:   fmt.Sprintf("store/%s/key", banktypes.StoreKey),
+		Height: reqHeight,
+		Data:   banktypes.CreateAccountBalancesPrefix(val.Address),
+		Prove:  true,
+	}
+
+	res, err := clientCtx.QueryABCI(req)
+	s.Require().NoError(err)
+
+	s.Require().Equal(reqHeight, res.Height)
+
+}