[FABG-803] Sync the latest files of fabric.

It will be used to implement parsing blocks.

Change-Id: I48b6b1c5a1a4f12da4dab59681a15273afa97c6c
Signed-off-by: ice <[email protected]>
Signed-off-by: Sudesh Shetty <[email protected]>

scripts/third_party_pins/fabric/apply_fabric_external_utils.sh

@@ -72,7 +72,7 @@ sed -i'' -e 's/"github.com\/hyperledger\/fabric\/bccsp\/factory"/factory "github
 sed -i'' -e 's/&bccsp.SHA256Opts{}/factory.GetSHA256Opts()/g' "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
 
 FILTER_FILENAME="protos/utils/txutils.go"
-FILTER_FN="GetBytesProposalPayloadForTx,GetEnvelopeFromBlock"
+FILTER_FN="GetBytesProposalPayloadForTx,GetEnvelopeFromBlock,GetPayloads"
 gofilter
 
 FILTER_FILENAME="core/common/ccprovider/ccprovider.go"

third_party/github.com/hyperledger/fabric/protos/utils/txutils.go

@@ -17,6 +17,34 @@ import (
 	"github.com/pkg/errors"
 )
 
+// GetPayloads gets the underlying payload objects in a TransactionAction
+func GetPayloads(txActions *peer.TransactionAction) (*peer.ChaincodeActionPayload, *peer.ChaincodeAction, error) {
+	// TODO: pass in the tx type (in what follows we're assuming the
+	// type is ENDORSER_TRANSACTION)
+	ccPayload, err := GetChaincodeActionPayload(txActions.Payload)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if ccPayload.Action == nil || ccPayload.Action.ProposalResponsePayload == nil {
+		return nil, nil, errors.New("no payload in ChaincodeActionPayload")
+	}
+	pRespPayload, err := GetProposalResponsePayload(ccPayload.Action.ProposalResponsePayload)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if pRespPayload.Extension == nil {
+		return nil, nil, errors.New("response payload is missing extension")
+	}
+
+	respPayload, err := GetChaincodeAction(pRespPayload.Extension)
+	if err != nil {
+		return ccPayload, nil, err
+	}
+	return ccPayload, respPayload, nil
+}
+
 // GetEnvelopeFromBlock gets an envelope from a block's Data field.
 func GetEnvelopeFromBlock(data []byte) (*common.Envelope, error) {
 	// Block always begins with an envelope