add getHexProofs

Author: mmsqe

rpc/backend/account_info.go

@@ -13,6 +13,7 @@ import (
 	rpctypes "github.com/evmos/ethermint/rpc/types"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/pkg/errors"
+	"github.com/tendermint/tendermint/proto/tendermint/crypto"
 )
 
 // GetCode returns the contract code at the given address and block number.
@@ -34,6 +35,17 @@ func (b *Backend) GetCode(address common.Address, blockNrOrHash rpctypes.BlockNu
 	return res.Code, nil
 }
 
+func getHexProofs(proof *crypto.ProofOps) []string {
+	var proofs []string
+	// check for proof
+	if proof != nil {
+		for _, p := range proof.Ops {
+			proofs = append(proofs, hexutil.Encode(p.Data))
+		}
+	}
+	return proofs
+}
+
 // GetProof returns an account object with proof and any storage proofs
 func (b *Backend) GetProof(address common.Address, storageKeys []string, blockNrOrHash rpctypes.BlockNumberOrHash) (*rpctypes.AccountResult, error) {
 	blockNum, err := b.BlockNumberFromTendermint(blockNrOrHash)
@@ -75,18 +87,10 @@ func (b *Backend) GetProof(address common.Address, storageKeys []string, blockNr
 			return nil, err
 		}
 
-		// check for proof
-		var storeProofs []string
-		if proof != nil {
-			for _, p := range proof.Ops {
-				storeProofs = append(storeProofs, hexutil.Encode(p.Data))
-			}
-		}
-
 		storageProofs[i] = rpctypes.StorageResult{
 			Key:   key,
 			Value: (*hexutil.Big)(new(big.Int).SetBytes(valueBz)),
-			Proof: storeProofs,
+			Proof: getHexProofs(proof),
 		}
 	}
 
@@ -107,22 +111,14 @@ func (b *Backend) GetProof(address common.Address, storageKeys []string, blockNr
 		return nil, err
 	}
 
-	// check for proof
-	var accProofs []string
-	if proof != nil {
-		for _, p := range proof.Ops {
-			accProofs = append(accProofs, hexutil.Encode(p.Data))
-		}
-	}
-
 	balance, ok := sdkmath.NewIntFromString(res.Balance)
 	if !ok {
 		return nil, errors.New("invalid balance")
 	}
 
 	return &rpctypes.AccountResult{
 		Address:      address,
-		AccountProof: accProofs,
+		AccountProof: getHexProofs(proof),
 		Balance:      (*hexutil.Big)(balance.BigInt()),
 		CodeHash:     common.HexToHash(res.CodeHash),
 		Nonce:        hexutil.Uint64(res.Nonce),