Merge "Chaincode access to Proposal fields"

core/chaincode/handler.go

@@ -28,6 +28,7 @@ import (
 	ccintf "github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/ledger"
 	pb "github.com/hyperledger/fabric/protos/peer"
+	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/looplab/fsm"
 	logging "github.com/op/go-logging"
 	"golang.org/x/net/context"
@@ -1082,9 +1083,17 @@ func (handler *Handler) enterEndState(e *fsm.Event, state string) {
 }
 
 func (handler *Handler) setChaincodeProposal(prop *pb.Proposal, msg *pb.ChaincodeMessage) error {
-	chaincodeLogger.Debug("setting chaincode proposal...")
+	chaincodeLogger.Debug("Setting chaincode proposal context...")
 	if prop != nil {
-		chaincodeLogger.Debug("TODO pass Proposal to chaincode...")
+		chaincodeLogger.Debug("Proposal different from nil. Creating chaincode proposal context...")
+
+		proposalContext, err := utils.GetChaincodeProposalContext(prop)
+		if err != nil {
+			chaincodeLogger.Debug("Failed getting proposal context from proposal [%s]", err)
+			return fmt.Errorf("Failed getting proposal context from proposal [%s]", err)
+		}
+
+		msg.ProposalContext = proposalContext
 	}
 	return nil
 }

core/chaincode/shim/chaincode.go

@@ -45,10 +45,11 @@ var chaincodeLogger = logging.MustGetLogger("shim")
 // ChaincodeStub is an object passed to chaincode for shim side handling of
 // APIs.
 type ChaincodeStub struct {
-	TxID           string
-	chaincodeEvent *pb.ChaincodeEvent
-	args           [][]byte
-	handler        *Handler
+	TxID            string
+	proposalContext *pb.ChaincodeProposalContext
+	chaincodeEvent  *pb.ChaincodeEvent
+	args            [][]byte
+	handler         *Handler
 }
 
 // Peer address derived from command line or env var
@@ -266,17 +267,18 @@ func chatWithPeer(chaincodename string, stream PeerChaincodeStream, cc Chaincode
 // -- init stub ---
 // ChaincodeInvocation functionality
 
-func (stub *ChaincodeStub) init(handler *Handler, txid string, input *pb.ChaincodeInput) {
+func (stub *ChaincodeStub) init(handler *Handler, txid string, input *pb.ChaincodeInput, proposalContext *pb.ChaincodeProposalContext) {
 	stub.TxID = txid
 	stub.args = input.Args
 	stub.handler = handler
+	stub.proposalContext = proposalContext
 }
 
 func InitTestStub(funargs ...string) *ChaincodeStub {
 	stub := ChaincodeStub{}
 	allargs := util.ToChaincodeArgs(funargs...)
 	newCI := &pb.ChaincodeInput{Args: allargs}
-	stub.init(&Handler{}, "TEST-txid", newCI)
+	stub.init(&Handler{}, "TEST-txid", newCI, nil) // TODO: add msg.ProposalContext
 	return &stub
 }
 
@@ -436,12 +438,20 @@ func (stub *ChaincodeStub) GetFunctionAndParameters() (function string, params [
 
 // GetCallerCertificate returns caller certificate
 func (stub *ChaincodeStub) GetCallerCertificate() ([]byte, error) {
-	return nil, nil
+	if stub.proposalContext != nil {
+		return stub.proposalContext.Transient, nil
+	}
+
+	return nil, errors.New("Creator field not set.")
 }
 
 // GetCallerMetadata returns caller metadata
 func (stub *ChaincodeStub) GetCallerMetadata() ([]byte, error) {
-	return nil, nil
+	if stub.proposalContext != nil {
+		return stub.proposalContext.Transient, nil
+	}
+
+	return nil, errors.New("Transient field not set.")
 }
 
 // GetBinding returns the transaction binding

core/chaincode/shim/handler.go

@@ -227,7 +227,7 @@ func (handler *Handler) handleInit(msg *pb.ChaincodeMessage) {
 		// Call chaincode's Run
 		// Create the ChaincodeStub which the chaincode can use to callback
 		stub := new(ChaincodeStub)
-		stub.init(handler, msg.Txid, input)
+		stub.init(handler, msg.Txid, input, msg.ProposalContext)
 		res, err := handler.cc.Init(stub)
 
 		if err != nil {
@@ -288,7 +288,7 @@ func (handler *Handler) handleTransaction(msg *pb.ChaincodeMessage) {
 		// Call chaincode's Run
 		// Create the ChaincodeStub which the chaincode can use to callback
 		stub := new(ChaincodeStub)
-		stub.init(handler, msg.Txid, input)
+		stub.init(handler, msg.Txid, input, msg.ProposalContext)
 		res, err := handler.cc.Invoke(stub)
 
 		if err != nil {