Update to TM v0.26.0 - Part II (#2681)

* Proof and verification updates
* Fix linting
* Fix key path creation
* Temporarily fix tendermint revision to make tests pass

Gopkg.toml

@@ -36,7 +36,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "v0.26.0"
+  revision = "ebee4377b15f2958b08994485375dd2ee8a649ac" # TODO replace w/ 0.26.1
 
 ## deps without releases:
 

client/context/query.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/store"
 	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/crypto/merkle"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	tmliteErr "github.com/tendermint/tendermint/lite/errors"
 	tmliteProxy "github.com/tendermint/tendermint/lite/proxy"
@@ -197,38 +198,34 @@ func (ctx CLIContext) Verify(height int64) (tmtypes.SignedHeader, error) {
 }
 
 // verifyProof perform response proof verification.
-func (ctx CLIContext) verifyProof(_ string, resp abci.ResponseQuery) error {
+func (ctx CLIContext) verifyProof(queryPath string, resp abci.ResponseQuery) error {
 	if ctx.Verifier == nil {
 		return fmt.Errorf("missing valid certifier to verify data from distrusted node")
 	}
 
-	// TODO: handle in another TM v0.26 update PR
-	// // the AppHash for height H is in header H+1
-	// commit, err := ctx.Verify(resp.Height + 1)
-	// if err != nil {
-	// 	return err
-	// }
-
-	// var multiStoreProof store.MultiStoreProof
-	// cdc := codec.New()
-
-	// err = cdc.UnmarshalBinaryLengthPrefixed(resp.Proof, &multiStoreProof)
-	// if err != nil {
-	// 	return errors.Wrap(err, "failed to unmarshalBinary rangeProof")
-	// }
-
-	// // verify the substore commit hash against trusted appHash
-	// substoreCommitHash, err := store.VerifyMultiStoreCommitInfo(
-	// 	multiStoreProof.StoreName, multiStoreProof.StoreInfos, commit.Header.AppHash,
-	// )
-	// if err != nil {
-	// 	return errors.Wrap(err, "failed in verifying the proof against appHash")
-	// }
-
-	// err = store.VerifyRangeProof(resp.Key, resp.Value, substoreCommitHash, &multiStoreProof.RangeProof)
-	// if err != nil {
-	// 	return errors.Wrap(err, "failed in the range proof verification")
-	// }
+	// the AppHash for height H is in header H+1
+	commit, err := ctx.Verify(resp.Height + 1)
+	if err != nil {
+		return err
+	}
+
+	// TODO: Instead of reconstructing, stash on CLIContext field?
+	prt := store.DefaultProofRuntime()
+
+	// TODO: Better convention for path?
+	storeName, err := parseQueryStorePath(queryPath)
+	if err != nil {
+		return err
+	}
+
+	kp := merkle.KeyPath{}
+	kp = kp.AppendKey([]byte(storeName), merkle.KeyEncodingURL)
+	kp = kp.AppendKey(resp.Key, merkle.KeyEncodingURL)
+
+	err = prt.VerifyValue(resp.Proof, commit.Header.AppHash, kp.String(), resp.Value)
+	if err != nil {
+		return errors.Wrap(err, "failed to prove merkle proof")
+	}
 
 	return nil
 }
@@ -241,20 +238,40 @@ func (ctx CLIContext) queryStore(key cmn.HexBytes, storeName, endPath string) ([
 }
 
 // isQueryStoreWithProof expects a format like /<queryType>/<storeName>/<subpath>
-// queryType can be app or store.
+// queryType must be "store" and subpath must be "key" to require a proof.
 func isQueryStoreWithProof(path string) bool {
 	if !strings.HasPrefix(path, "/") {
 		return false
 	}
 
 	paths := strings.SplitN(path[1:], "/", 3)
-	if len(paths) != 3 {
+	switch {
+	case len(paths) != 3:
 		return false
-	}
-
-	if store.RequireProof("/" + paths[2]) {
+	case paths[0] != "store":
+		return false
+	case store.RequireProof("/" + paths[2]):
 		return true
 	}
 
 	return false
 }
+
+// parseQueryStorePath expects a format like /store/<storeName>/key.
+func parseQueryStorePath(path string) (storeName string, err error) {
+	if !strings.HasPrefix(path, "/") {
+		return "", errors.New("expected path to start with /")
+	}
+
+	paths := strings.SplitN(path[1:], "/", 3)
+	switch {
+	case len(paths) != 3:
+		return "", errors.New("expected format like /store/<storeName>/key")
+	case paths[0] != "store":
+		return "", errors.New("expected format like /store/<storeName>/key")
+	case paths[2] != "key":
+		return "", errors.New("expected format like /store/<storeName>/key")
+	}
+
+	return paths[1], nil
+}

store/iavlstore.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/tendermint/iavl"
 	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/crypto/merkle"
 	cmn "github.com/tendermint/tendermint/libs/common"
 	dbm "github.com/tendermint/tendermint/libs/db"
 
@@ -209,8 +210,8 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 	res.Height = getHeight(tree, req)
 
 	switch req.Path {
-	case "/key":
-		key := req.Data // Data holds the key bytes
+	case "/key": // get by key
+		key := req.Data // data holds the key bytes
 
 		res.Key = key
 		if !st.VersionExists(res.Height) {
@@ -219,23 +220,14 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
 		}
 
 		if req.Prove {
-			value, _, err := tree.GetVersionedWithProof(key, res.Height)
+			value, proof, err := tree.GetVersionedWithProof(key, res.Height)
 			if err != nil {
 				res.Log = err.Error()
 				break
 			}
 
 			res.Value = value
-			// cdc := amino.NewCodec()
-
-			// p, err := cdc.MarshalBinaryLengthPrefixed(proof)
-			// if err != nil {
-			// 	res.Log = err.Error()
-			// 	break
-			// }
-
-			// TODO: handle in another TM v0.26 update PR
-			// res.Proof = p
+			res.Proof = &merkle.Proof{Ops: []merkle.ProofOp{iavl.NewIAVLValueOp(key, proof).ProofOp()}}
 		} else {
 			_, res.Value = tree.GetVersioned(key, res.Height)
 		}