certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update QueryTendermint to take in tendermint height (#7337) 

* Update QueryTendermint to take in tendermint height

Update QueryTendermint to subtract the provided height by one to query at the IAVL height.

* Update x/ibc/client/query.go

Co-authored-by: Christopher Goes <cwgoes@pluranimity.org>

* update height check to > 2

Update height check to ensure that the client context height is greater than two before decrementing. Queries at height 0 and 1 are not expected to succeed. Documentation was updated to reflect this reasoning

* update query to return error for height <= 2

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Christopher Goes <cwgoes@pluranimity.org>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
colin axnér 2020-09-24 08:53:30 +02:00 committed by GitHub
parent 9d08e63642
commit 7ea6b2c5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
x/ibc/client/query.go
View File

@ -12,16 +12,32 @@ import (
host "github.com/cosmos/cosmos-sdk/x/ibc/24-host" host "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
) )
// QueryTendermintProof performs an ABCI query with the given key and returns the value // QueryTendermintProof performs an ABCI query with the given key and returns
// of the query, the proto encoded merkle proof for the query and the height // the value of the query, the proto encoded merkle proof, and the height of
// at which the proof will succeed on a tendermint verifier (one above the // the Tendermint block containing the state root. The desired tendermint height
// returned IAVL version height). // to perform the query should be set in the client context. The query will be
// performed at one below this height (at the IAVL version) in order to obtain
// the correct merkle proof. Proof queries at height less than or equal to 2 are
// not supported.
// Issue: https://github.com/cosmos/cosmos-sdk/issues/6567 // Issue: https://github.com/cosmos/cosmos-sdk/issues/6567
func QueryTendermintProof(clientCtx client.Context, key []byte) ([]byte, []byte, clienttypes.Height, error) { func QueryTendermintProof(clientCtx client.Context, key []byte) ([]byte, []byte, clienttypes.Height, error) {
height := clientCtx.Height
// ABCI queries at height less than or equal to 2 are not supported.
// Base app does not support queries for height less than or equal to 1.
// Therefore, a query at height 2 would be equivalent to a query at height 3
if clientCtx.Height <= 2 {
return nil, nil, clienttypes.Height{}, fmt.Errorf("proof queries at height <= 2 are not supported")
}
// Use the IAVL height if a valid tendermint height is passed in.
height--
req := abci.RequestQuery{ req := abci.RequestQuery{
Path: fmt.Sprintf("store/%s/key", host.StoreKey), Path: fmt.Sprintf("store/%s/key", host.StoreKey),
Data: key, Height: height,
Prove: true, Data: key,
Prove: true,
} }
res, err := clientCtx.QueryABCI(req) res, err := clientCtx.QueryABCI(req)