merge GetProof with accountProof and storageProof

Signed-off-by: Naohiro Yoshida <naohiro.yoshida@datachain.jp>

Author: Naohiro Yoshida

module/proof.go

@@ -28,15 +28,15 @@ func (pr *Prover) getAccountProof(height uint64) ([]byte, common.Hash, error) {
 	return stateProof.AccountProofRLP, common.BytesToHash(stateProof.StorageHash[:]), nil
 }
 
-func (pr *Prover) getStateCommitmentProof(path []byte, height exported.Height) ([]byte, error) {
+func (pr *Prover) getStateCommitmentProof(path []byte, height exported.Height) ([]byte, []byte, error) {
 	// calculate slot for commitment
 	storageKey := crypto.Keccak256Hash(append(
 		crypto.Keccak256Hash(path).Bytes(),
 		IBCCommitmentsSlot.Bytes()...,
 	))
 	storageKeyHex, err := storageKey.MarshalText()
 	if err != nil {
-		return nil, fmt.Errorf("failed to marshal slot: height = %d, %+v", height.GetRevisionHeight(), err)
+		return nil, nil, fmt.Errorf("failed to marshal slot: height = %d, %+v", height.GetRevisionHeight(), err)
 	}
 
 	// call eth_getProof
@@ -46,10 +46,10 @@ func (pr *Prover) getStateCommitmentProof(path []byte, height exported.Height) (
 		big.NewInt(int64(height.GetRevisionHeight())),
 	)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get state commitment proof : address = %s, height = %d, slot = %v, %+v",
+		return nil, nil, fmt.Errorf("failed to get state commitment proof : address = %s, height = %d, slot = %v, %+v",
 			pr.chain.IBCAddress(), height.GetRevisionHeight(), storageKeyHex, err)
 	}
-	return stateProof.StorageProofRLP[0], nil
+	return stateProof.AccountProofRLP, stateProof.StorageProofRLP[0], nil
 }
 
 func (pr *Prover) GetStorageRoot(header *types.Header) (common.Hash, error) {

module/prover.go

@@ -142,17 +142,12 @@ func (pr *Prover) SetupHeadersForUpdateByLatestHeight(clientStateLatestHeight ex
 
 func (pr *Prover) ProveState(ctx core.QueryContext, path string, value []byte) ([]byte, clienttypes.Height, error) {
 	proofHeight := toHeight(ctx.Height())
-	accountProofRLP, _, err := pr.getAccountProof(proofHeight.RevisionHeight)
-	if err != nil {
-		return nil, proofHeight, err
-	}
-
-	commitmentProof, err := pr.getStateCommitmentProof([]byte(path), proofHeight)
+	accountProof, commitmentProof, err := pr.getStateCommitmentProof([]byte(path), proofHeight)
 	if err != nil {
 		return nil, proofHeight, err
 	}
 	ret := ProveState{
-		AccountProof:    accountProofRLP,
+		AccountProof:    accountProof,
 		CommitmentProof: commitmentProof,
 	}
 	proof, err := ret.Marshal()