Chaincode API Enhancement

This change-set allows the chaincode to get the
proposal's creator, transient field and binding.
This is done by trasferring to the chiancode the proposal.

This change-set comes in the context of
https://jira.hyperledger.org/browse/FAB-1751
and
https://jira.hyperledger.org/browse/FAB-1752

Change-Id: I8ac643a24008fbe7edf2779636dc0de1d1a0ddc1
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

accesscontrol/crypto/attr/attr_support.go

@@ -28,8 +28,8 @@ import (
 
 // chaincodeHolder is the struct that hold the certificate and the metadata. An implementation is ChaincodeStub
 type chaincodeHolder interface {
-	// GetCallerCertificate returns caller certificate
-	GetCallerCertificate() ([]byte, error)
+	// GetCreator returns caller certificate
+	GetCreator() ([]byte, error)
 
 	// GetCallerMetadata returns caller metadata
 	/*
@@ -82,8 +82,8 @@ type chaincodeHolderImpl struct {
 	Certificate []byte
 }
 
-// GetCallerCertificate returns caller certificate
-func (holderImpl *chaincodeHolderImpl) GetCallerCertificate() ([]byte, error) {
+// GetCreator returns caller certificate
+func (holderImpl *chaincodeHolderImpl) GetCreator() ([]byte, error) {
 	return holderImpl.Certificate, nil
 }
 
@@ -99,7 +99,7 @@ func GetValueFrom(attributeName string, cert []byte) ([]byte, error) {
 //NewAttributesHandlerImpl creates a new AttributesHandlerImpl from a pb.ChaincodeSecurityContext object.
 func NewAttributesHandlerImpl(holder chaincodeHolder) (*AttributesHandlerImpl, error) {
 	// Getting certificate
-	certRaw, err := holder.GetCallerCertificate()
+	certRaw, err := holder.GetCreator()
 	if err != nil {
 		return nil, err
 	}

accesscontrol/crypto/attr/attr_support_test.go

@@ -40,8 +40,8 @@ type chaincodeStubMock struct {
 	*/
 }
 
-// GetCallerCertificate returns caller certificate
-func (shim *chaincodeStubMock) GetCallerCertificate() ([]byte, error) {
+// GetCreator returns caller certificate
+func (shim *chaincodeStubMock) GetCreator() ([]byte, error) {
 	return shim.callerCert, nil
 }
 
@@ -60,9 +60,9 @@ type certErrorMock struct {
 	*/
 }
 
-// GetCallerCertificate returns caller certificate
-func (shim *certErrorMock) GetCallerCertificate() ([]byte, error) {
-	return nil, errors.New("GetCallerCertificate error")
+// GetCreator returns caller certificate
+func (shim *certErrorMock) GetCreator() ([]byte, error) {
+	return nil, errors.New("GetCreator error")
 }
 
 /*
@@ -76,16 +76,16 @@ type metadataErrorMock struct {
 	callerCert []byte
 }
 
-// GetCallerCertificate returns caller certificate
-func (shim *metadataErrorMock) GetCallerCertificate() ([]byte, error) {
+// GetCreator returns caller certificate
+func (shim *metadataErrorMock) GetCreator() ([]byte, error) {
 	return shim.callerCert, nil
 }
 
 /*
 	TODO: ##attributes-keys-pending This code have be redefined to avoid use of metadata field.
 // GetCallerMetadata returns caller metadata
 func (shim *metadataErrorMock) GetCallerMetadata() ([]byte, error) {
-	return nil, errors.New("GetCallerCertificate error")
+	return nil, errors.New("GetCreator error")
 }*/
 
 func TestVerifyAttribute(t *testing.T) {

core/chaincode/handler.go

@@ -31,7 +31,6 @@ import (
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/peer"
 	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"
@@ -1379,13 +1378,7 @@ func (handler *Handler) setChaincodeProposal(prop *pb.Proposal, msg *pb.Chaincod
 	if prop != nil {
 		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
+		msg.Proposal = prop
 	}
 	return nil
 }
@@ -1400,7 +1393,6 @@ func (handler *Handler) ready(ctxt context.Context, chainID string, txid string,
 	chaincodeLogger.Debug("sending READY")
 	ccMsg := &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_READY, Txid: txid}
 
-	//if security is disabled the context elements will just be nil
 	if err := handler.setChaincodeProposal(prop, ccMsg); err != nil {
 		return nil, err
 	}
@@ -1465,7 +1457,6 @@ func (handler *Handler) sendExecuteMessage(ctxt context.Context, chainID string,
 		chaincodeLogger.Debugf("[%s]Inside sendExecuteMessage. Message %s", shorttxid(msg.Txid), msg.Type.String())
 	}
 
-	//if security is disabled the context elements will just be nil
 	if err = handler.setChaincodeProposal(prop, msg); err != nil {
 		return nil, err
 	}

core/chaincode/shim/chaincode.go

@@ -29,9 +29,9 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/comm"
 	pb "github.com/hyperledger/fabric/protos/peer"
+	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
 	"golang.org/x/net/context"
@@ -49,11 +49,16 @@ const (
 // ChaincodeStub is an object passed to chaincode for shim side handling of
 // APIs.
 type ChaincodeStub struct {
-	TxID            string
-	proposalContext *pb.ChaincodeProposalContext
-	chaincodeEvent  *pb.ChaincodeEvent
-	args            [][]byte
-	handler         *Handler
+	TxID           string
+	chaincodeEvent *pb.ChaincodeEvent
+	args           [][]byte
+	handler        *Handler
+	proposal       *pb.Proposal
+
+	// Additional fields extracted from the proposal
+	creator   []byte
+	transient map[string][]byte
+	binding   []byte
 }
 
 // Peer address derived from command line or env var
@@ -270,20 +275,32 @@ func chatWithPeer(chaincodename string, stream PeerChaincodeStream, cc Chaincode
 // -- init stub ---
 // ChaincodeInvocation functionality
 
-func (stub *ChaincodeStub) init(handler *Handler, txid string, input *pb.ChaincodeInput, proposalContext *pb.ChaincodeProposalContext) {
+func (stub *ChaincodeStub) init(handler *Handler, txid string, input *pb.ChaincodeInput, proposal *pb.Proposal) error {
 	stub.TxID = txid
 	stub.args = input.Args
 	stub.handler = handler
-	stub.proposalContext = proposalContext
-}
+	stub.proposal = proposal
+
+	// TODO: sanity check: verify that every call to init with a nil
+	// proposal is a legitimate one, meaning it is an internal call
+	// to system chaincodes.
+	if proposal != nil {
+		// Extract creator, transient, binding...
+		var err error
+		stub.creator, stub.transient, err = utils.GetChaincodeProposalContext(proposal)
+		if err != nil {
+			return fmt.Errorf("Failed extracting proposal fields. [%s]", err)
+		}
 
-// InitTestStub initializes an appropriate stub for testing chaincode
-func InitTestStub(funargs ...string) *ChaincodeStub {
-	stub := ChaincodeStub{}
-	allargs := util.ToChaincodeArgs(funargs...)
-	newCI := &pb.ChaincodeInput{Args: allargs}
-	stub.init(&Handler{}, "TEST-txid", newCI, nil) // TODO: add msg.ProposalContext
-	return &stub
+		// TODO: txid must uniquely identity the transaction.
+		// Remove this comment once replay attack protection will be in place
+		stub.binding, err = utils.ComputeProposalBinding(proposal)
+		if err != nil {
+			return fmt.Errorf("Failed computing binding from proposal. [%s]", err)
+		}
+	}
+
+	return nil
 }
 
 // GetTxID returns the transaction ID
@@ -505,33 +522,34 @@ func (stub *ChaincodeStub) GetFunctionAndParameters() (function string, params [
 	return
 }
 
-// GetCallerCertificate returns caller certificate
-func (stub *ChaincodeStub) GetCallerCertificate() ([]byte, error) {
-	if stub.proposalContext != nil {
-		return stub.proposalContext.Transient, nil
-	}
-
-	return nil, errors.New("Creator field not set.")
+// GetCreator returns SignatureHeader.Creator of the proposal
+// this Stub refers to.
+func (stub *ChaincodeStub) GetCreator() ([]byte, error) {
+	return stub.creator, nil
 }
 
-// GetCallerMetadata returns caller metadata
-func (stub *ChaincodeStub) GetCallerMetadata() ([]byte, error) {
-	if stub.proposalContext != nil {
-		return stub.proposalContext.Transient, nil
-	}
-
-	return nil, errors.New("Transient field not set.")
+// GetTransient returns the ChaincodeProposalPayload.transient field.
+// It is a map that contains data (e.g. cryptographic material)
+// that might be used to implement some form of application-level confidentiality. The contents
+// of this field, as prescribed by ChaincodeProposalPayload, are supposed to always
+// be omitted from the transaction and excluded from the ledger.
+func (stub *ChaincodeStub) GetTransient() (map[string][]byte, error) {
+	return stub.transient, nil
 }
 
 // GetBinding returns the transaction binding
 func (stub *ChaincodeStub) GetBinding() ([]byte, error) {
-	return nil, nil
+	return stub.binding, nil
 }
 
-// GetPayload returns transaction payload, which is a `ChaincodeSpec` defined
-// in fabric/protos/chaincode.proto
-func (stub *ChaincodeStub) GetPayload() ([]byte, error) {
-	return nil, nil
+// GetArgsSlice returns the arguments to the stub call as a byte array
+func (stub *ChaincodeStub) GetArgsSlice() ([]byte, error) {
+	args := stub.GetArgs()
+	res := []byte{}
+	for _, barg := range args {
+		res = append(res, barg...)
+	}
+	return res, nil
 }
 
 // GetTxTimestamp returns transaction created timestamp, which is currently

core/chaincode/shim/handler.go

@@ -227,7 +227,12 @@ 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, msg.ProposalContext)
+		err := stub.init(handler, msg.Txid, input, msg.Proposal)
+		if err != nil {
+			chaincodeLogger.Errorf("[%s]Init get error response [%s]. Sending %s", shorttxid(msg.Txid), err.Error(), pb.ChaincodeMessage_ERROR)
+			nextStateMsg = &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_ERROR, Payload: []byte(err.Error()), Txid: msg.Txid, ChaincodeEvent: stub.chaincodeEvent}
+			return
+		}
 		res := handler.cc.Init(stub)
 		chaincodeLogger.Debugf("[%s]Init get response status: %d", shorttxid(msg.Txid), res.Status)
 
@@ -296,7 +301,14 @@ 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, msg.ProposalContext)
+		err := stub.init(handler, msg.Txid, input, msg.Proposal)
+		if err != nil {
+			payload := []byte(err.Error())
+			// Send ERROR message to chaincode support and change state
+			chaincodeLogger.Errorf("[%s]Transaction execution failed. Sending %s", shorttxid(msg.Txid), pb.ChaincodeMessage_ERROR)
+			nextStateMsg = &pb.ChaincodeMessage{Type: pb.ChaincodeMessage_ERROR, Payload: payload, Txid: msg.Txid, ChaincodeEvent: stub.chaincodeEvent}
+			return
+		}
 		res := handler.cc.Invoke(stub)
 
 		// Endorser will handle error contained in Response.

core/chaincode/shim/interfaces.go

@@ -101,18 +101,22 @@ type ChaincodeStubInterface interface {
 	// key values across time. GetHistoryForKey is intended to be used for read-only queries.
 	GetHistoryForKey(key string) (StateQueryIteratorInterface, error)
 
-	// GetCallerCertificate returns caller certificate
-	GetCallerCertificate() ([]byte, error)
+	// GetCreator returns SignatureHeader.Creator of the proposal
+	// this Stub refers to.
+	GetCreator() ([]byte, error)
 
-	// GetCallerMetadata returns caller metadata
-	GetCallerMetadata() ([]byte, error)
+	// GetTransient returns the ChaincodeProposalPayload.transient field.
+	// It is a map that contains data (e.g. cryptographic material)
+	// that might be used to implement some form of application-level confidentiality. The contents
+	// of this field, as prescribed by ChaincodeProposalPayload, are supposed to always
+	// be omitted from the transaction and excluded from the ledger.
+	GetTransient() (map[string][]byte, error)
 
 	// GetBinding returns the transaction binding
 	GetBinding() ([]byte, error)
 
-	// GetPayload returns transaction payload, which is a `ChaincodeSpec` defined
-	// in fabric/protos/chaincode.proto
-	GetPayload() ([]byte, error)
+	// GetArgsSlice returns the arguments to the stub call as a byte array
+	GetArgsSlice() ([]byte, error)
 
 	// GetTxTimestamp returns transaction created timestamp, which is currently
 	// taken from the peer receiving the transaction. Note that this timestamp

core/chaincode/shim/java/build.gradle

@@ -93,6 +93,9 @@ task copyProtos(type:Copy){
  from ("${rootDir}/protos/peer"){
      include '**/chaincodeevent.proto'
      include '**/chaincode.proto'
+     include '**/chaincodeshim.proto'
+     include '**/proposal.proto'
+     include '**/proposal_response.proto'
  }
     into "${projectDir}/src/main/proto/peer"
 

core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeBase.java

@@ -29,8 +29,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hyperledger.protos.Chaincode.ChaincodeID;
-import org.hyperledger.protos.Chaincode.ChaincodeMessage;
-import org.hyperledger.protos.Chaincode.ChaincodeMessage.Type;
+import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage;
+import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage.Type;
 import org.hyperledger.protos.ChaincodeSupportGrpc;
 import org.hyperledger.protos.ChaincodeSupportGrpc.ChaincodeSupportStub;
 

core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/ChaincodeStub.java

@@ -20,7 +20,7 @@
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hyperledger.protos.Chaincode;
+import org.hyperledger.protos.Chaincodeshim;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -102,7 +102,7 @@ public Map<String, String> getStateByRange(String startKey, String endKey) {
      */
     public Map<String, ByteString> getStateByRangeRaw(String startKey, String endKey) {
         Map<String, ByteString> map = new HashMap<>();
-        for (Chaincode.QueryStateKeyValue mapping : handler.handleGetStateByRange(
+        for (Chaincodeshim.QueryStateKeyValue mapping : handler.handleGetStateByRange(
                 startKey, endKey, uuid).getKeysAndValuesList()) {
             map.put(mapping.getKey(), mapping.getValue());
         }

core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/Handler.java

@@ -28,14 +28,15 @@
 import org.hyperledger.java.fsm.exceptions.NoTransitionException;
 import org.hyperledger.java.helper.Channel;
 import org.hyperledger.protos.Chaincode.*;
-import org.hyperledger.protos.Chaincode.ChaincodeMessage.Builder;
+import org.hyperledger.protos.Chaincodeshim.*;
+import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage.Builder;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static org.hyperledger.java.fsm.CallbackType.*;
-import static org.hyperledger.protos.Chaincode.ChaincodeMessage.Type.*;
+import static org.hyperledger.protos.Chaincodeshim.ChaincodeMessage.Type.*;
 
 public class Handler {
 

core/chaincode/shim/java/src/main/java/org/hyperledger/java/shim/NextStateInfo.java

@@ -16,7 +16,7 @@
 
 package org.hyperledger.java.shim;
 
-import org.hyperledger.protos.Chaincode.ChaincodeMessage;
+import org.hyperledger.protos.Chaincodeshim.ChaincodeMessage;
 
 public class NextStateInfo {
 

core/chaincode/shim/mockstub.go

@@ -251,12 +251,12 @@ func (stub *MockStub) InvokeChaincode(chaincodeName string, args [][]byte, chann
 }
 
 // Not implemented
-func (stub *MockStub) GetCallerCertificate() ([]byte, error) {
+func (stub *MockStub) GetCreator() ([]byte, error) {
 	return nil, nil
 }
 
 // Not implemented
-func (stub *MockStub) GetCallerMetadata() ([]byte, error) {
+func (stub *MockStub) GetTransient() (map[string][]byte, error) {
 	return nil, nil
 }
 
@@ -266,7 +266,7 @@ func (stub *MockStub) GetBinding() ([]byte, error) {
 }
 
 // Not implemented
-func (stub *MockStub) GetPayload() ([]byte, error) {
+func (stub *MockStub) GetArgsSlice() ([]byte, error) {
 	return nil, nil
 }
 

examples/chaincode/go/asset_management/asset_management.go

@@ -173,7 +173,7 @@ func (t *AssetManagementChaincode) isCaller(stub shim.ChaincodeStubInterface, ce
 	if err != nil {
 		return false, errors.New("Failed getting metadata")
 	}
-	payload, err := stub.GetPayload()
+	payload, err := stub.GetArgsSlice()
 	if err != nil {
 		return false, errors.New("Failed getting payload")
 	}

examples/chaincode/go/asset_management_interactive/asset_management.go

@@ -210,7 +210,7 @@ func (t *AssetManagementChaincode) isCaller(stub shim.ChaincodeStubInterface, ce
 	if err != nil {
 		return false, errors.New("Failed getting metadata")
 	}
-	payload, err := stub.GetPayload()
+	payload, err := stub.GetArgsSlice()
 	if err != nil {
 		return false, errors.New("Failed getting payload")
 	}

examples/chaincode/go/rbac_tcerts_no_attrs/rbac.go

@@ -242,7 +242,7 @@ func (t *RBACChaincode) hasInvokerRole(stub shim.ChaincodeStubInterface, role st
 	}
 
 	// Verify signature
-	payload, err := stub.GetPayload()
+	payload, err := stub.GetArgsSlice()
 	if err != nil {
 		return false, nil, errors.New("Failed getting payload")
 	}

protos/peer/admin.pb.go

@@ -19,7 +19,6 @@ syntax = "proto3";
 package protos;
 option java_package = "org.hyperledger.protos";
 option go_package = "github.com/hyperledger/fabric/protos/peer";
-import "peer/chaincodeevent.proto";
 import "google/protobuf/timestamp.proto";
 
 
@@ -103,102 +102,4 @@ message ChaincodeInvocationSpec {
     //  2, a decoding used to decode user (string) input to bytes
     // Currently, SHA256 with BASE64 is supported (e.g. idGenerationAlg='sha256base64')
     string id_generation_alg = 2;
-}
-
-// ChaincodeProposalContext contains proposal data that we send to the chaincode
-// container shim and allow the chaincode to access through the shim interface.
-message ChaincodeProposalContext {
-
-    // Creator corresponds to SignatureHeader.Creator
-    bytes creator = 1;
-
-    // Transient corresponds to ChaincodeProposalPayload.Transient
-    // TODO: The transient field is supposed to carry application-specific
-    // data. They might be realted to access-control, encryption and so on.
-    // To simply access to this data, replacing bytes with a map
-    // is the next step to be carried.
-    bytes transient = 2;
-}
-
-message ChaincodeMessage {
-
-    enum Type {
-        UNDEFINED = 0;
-        REGISTER = 1;
-        REGISTERED = 2;
-        INIT = 3;
-        READY = 4;
-        TRANSACTION = 5;
-        COMPLETED = 6;
-        ERROR = 7;
-        GET_STATE = 8;
-        PUT_STATE = 9;
-        DEL_STATE = 10;
-        INVOKE_CHAINCODE = 11;
-        RESPONSE = 13;
-        GET_STATE_BY_RANGE = 14;
-        GET_QUERY_RESULT = 15;
-        QUERY_STATE_NEXT = 16;
-        QUERY_STATE_CLOSE = 17;
-        KEEPALIVE = 18;
-        GET_HISTORY_FOR_KEY = 19;
-    }
-
-    Type type = 1;
-    google.protobuf.Timestamp timestamp = 2;
-    bytes payload = 3;
-    string txid = 4;
-
-    ChaincodeProposalContext proposal_context = 5;
-
-    //event emmited by chaincode. Used only with Init or Invoke.
-    // This event is then stored (currently)
-    //with Block.NonHashData.TransactionResult
-    ChaincodeEvent chaincode_event = 6;
-}
-
-message PutStateInfo {
-    string key = 1;
-    bytes value = 2;
-}
-
-message GetStateByRange {
-    string startKey = 1;
-    string endKey = 2;
-}
-
-message GetQueryResult {
-    string query = 1;
-}
-
-message GetHistoryForKey {
-    string key = 1;
-}
-
-message QueryStateNext {
-    string id = 1;
-}
-
-message QueryStateClose {
-    string id = 1;
-}
-
-message QueryStateKeyValue {
-    string key = 1;
-    bytes value = 2;
-}
-
-message QueryStateResponse {
-    repeated QueryStateKeyValue keys_and_values = 1;
-    bool has_more = 2;
-    string id = 3;
-}
-
-// Interface that provides support to chaincode execution. ChaincodeContext
-// provides the context necessary for the server to respond appropriately.
-service ChaincodeSupport {
-
-    rpc Register(stream ChaincodeMessage) returns (stream ChaincodeMessage) {}
-
-
-}
+}

protos/peer/chaincode.pb.go

@@ -0,0 +1,108 @@
+/*
+Copyright IBM Corp. 2016 All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+		 http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+syntax = "proto3";
+
+package protos;
+option java_package = "org.hyperledger.protos";
+option go_package = "github.com/hyperledger/fabric/protos/peer";
+import "peer/chaincodeevent.proto";
+import "peer/proposal.proto";
+import "google/protobuf/timestamp.proto";
+
+
+message ChaincodeMessage {
+
+    enum Type {
+        UNDEFINED = 0;
+        REGISTER = 1;
+        REGISTERED = 2;
+        INIT = 3;
+        READY = 4;
+        TRANSACTION = 5;
+        COMPLETED = 6;
+        ERROR = 7;
+        GET_STATE = 8;
+        PUT_STATE = 9;
+        DEL_STATE = 10;
+        INVOKE_CHAINCODE = 11;
+        RESPONSE = 13;
+        GET_STATE_BY_RANGE = 14;
+        GET_QUERY_RESULT = 15;
+        QUERY_STATE_NEXT = 16;
+        QUERY_STATE_CLOSE = 17;
+        KEEPALIVE = 18;
+        GET_HISTORY_FOR_KEY = 19;
+    }
+
+    Type type = 1;
+    google.protobuf.Timestamp timestamp = 2;
+    bytes payload = 3;
+    string txid = 4;
+
+    Proposal proposal = 5;
+
+    //event emmited by chaincode. Used only with Init or Invoke.
+    // This event is then stored (currently)
+    //with Block.NonHashData.TransactionResult
+    ChaincodeEvent chaincode_event = 6;
+}
+
+message PutStateInfo {
+    string key = 1;
+    bytes value = 2;
+}
+
+message GetStateByRange {
+    string startKey = 1;
+    string endKey = 2;
+}
+
+message GetQueryResult {
+    string query = 1;
+}
+
+message GetHistoryForKey {
+    string key = 1;
+}
+
+message QueryStateNext {
+    string id = 1;
+}
+
+message QueryStateClose {
+    string id = 1;
+}
+
+message QueryStateKeyValue {
+    string key = 1;
+    bytes value = 2;
+}
+
+message QueryStateResponse {
+    repeated QueryStateKeyValue keys_and_values = 1;
+    bool has_more = 2;
+    string id = 3;
+}
+
+// Interface that provides support to chaincode execution. ChaincodeContext
+// provides the context necessary for the server to respond appropriately.
+service ChaincodeSupport {
+
+    rpc Register(stream ChaincodeMessage) returns (stream ChaincodeMessage) {}
+
+
+}

protos/peer/chaincode.proto

@@ -217,8 +217,8 @@ message ChaincodeHeaderExtension {
 	// The PayloadVisibility field controls to what extent the Proposal's payload
 	// (recall that for the type CHAINCODE, it is ChaincodeProposalPayload
 	// message) field will be visible in the final transaction and in the ledger.
-	// Ideally, it would be configurable, supporting at least 3 main “visibility
-	// modes”:
+	// Ideally, it would be configurable, supporting at least 3 main visibility
+	// modes:
 	// 1. all bytes of the payload are visible;
 	// 2. only a hash of the payload is visible;
 	// 3. nothing is visible.
@@ -240,11 +240,11 @@ message ChaincodeProposalPayload {
 	// deploys a new chaincode, ESCC/VSCC are part of this field.
 	bytes input  = 1;
 
-	// Transient contains data (e.g. cryptographic material) that might be used
+	// TransientMap contains data (e.g. cryptographic material) that might be used
 	// to implement some form of application-level confidentiality. The contents
 	// of this field are supposed to always be omitted from the transaction and
 	// excluded from the ledger.
-	bytes transient = 2;
+	map<string, bytes> TransientMap = 2;
 }
 
 // ChaincodeAction contains the actions the events generated by the execution

protos/peer/chaincodeshim.pb.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 
 	"encoding/base64"
+	"encoding/binary"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/bccsp"
@@ -52,32 +53,42 @@ func GetChaincodeInvocationSpec(prop *peer.Proposal) (*peer.ChaincodeInvocationS
 	return cis, nil
 }
 
-// GetChaincodeProposalContext returns a ChaincodeProposalContext from a Proposal
-func GetChaincodeProposalContext(prop *peer.Proposal) (*peer.ChaincodeProposalContext, error) {
-	// get back the header
+// GetChaincodeProposalContext returns creator and transient
+func GetChaincodeProposalContext(prop *peer.Proposal) ([]byte, map[string][]byte, error) {
+	if prop == nil {
+		return nil, nil, fmt.Errorf("Proposal is nil")
+	}
+	if len(prop.Header) == 0 {
+		return nil, nil, fmt.Errorf("Proposal's header is nil")
+	}
+	if len(prop.Payload) == 0 {
+		return nil, nil, fmt.Errorf("Proposal's payload is nil")
+	}
+
+	//// get back the header
 	hdr, err := GetHeader(prop.Header)
 	if err != nil {
-		return nil, fmt.Errorf("Could not extract the header from the proposal: %s", err)
+		return nil, nil, fmt.Errorf("Could not extract the header from the proposal: %s", err)
+	}
+	if hdr == nil {
+		return nil, nil, fmt.Errorf("Unmarshalled header is nil")
 	}
 	if common.HeaderType(hdr.ChannelHeader.Type) != common.HeaderType_ENDORSER_TRANSACTION &&
 		common.HeaderType(hdr.ChannelHeader.Type) != common.HeaderType_CONFIG {
-		return nil, fmt.Errorf("Invalid proposal type expected ENDORSER_TRANSACTION or CONFIG. Was: %d", hdr.ChannelHeader.Type)
+		return nil, nil, fmt.Errorf("Invalid proposal type expected ENDORSER_TRANSACTION or CONFIG. Was: %d", hdr.ChannelHeader.Type)
 	}
 
 	if hdr.SignatureHeader == nil {
-		return nil, errors.New("Invalid signature header. It must be different from nil.")
+		return nil, nil, errors.New("Invalid signature header. It must be different from nil.")
 	}
 
 	ccPropPayload := &peer.ChaincodeProposalPayload{}
 	err = proto.Unmarshal(prop.Payload, ccPropPayload)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return &peer.ChaincodeProposalContext{
-		Creator:   hdr.SignatureHeader.Creator,
-		Transient: ccPropPayload.Transient,
-	}, nil
+	return hdr.SignatureHeader.Creator, ccPropPayload.TransientMap, nil
 }
 
 // GetHeader Get Header from bytes
@@ -262,7 +273,7 @@ func CreateChaincodeProposal(typ common.HeaderType, chainID string, cis *peer.Ch
 }
 
 // CreateChaincodeProposalWithTransient creates a proposal from given input
-func CreateChaincodeProposalWithTransient(typ common.HeaderType, chainID string, cis *peer.ChaincodeInvocationSpec, creator []byte, transient []byte) (*peer.Proposal, string, error) {
+func CreateChaincodeProposalWithTransient(typ common.HeaderType, chainID string, cis *peer.ChaincodeInvocationSpec, creator []byte, transientMap map[string][]byte) (*peer.Proposal, string, error) {
 	ccHdrExt := &peer.ChaincodeHeaderExtension{ChaincodeId: cis.ChaincodeSpec.ChaincodeId}
 	ccHdrExtBytes, err := proto.Marshal(ccHdrExt)
 	if err != nil {
@@ -274,7 +285,7 @@ func CreateChaincodeProposalWithTransient(typ common.HeaderType, chainID string,
 		return nil, "", err
 	}
 
-	ccPropPayload := &peer.ChaincodeProposalPayload{Input: cisBytes, Transient: transient}
+	ccPropPayload := &peer.ChaincodeProposalPayload{Input: cisBytes, TransientMap: transientMap}
 	ccPropPayloadBytes, err := proto.Marshal(ccPropPayload)
 	if err != nil {
 		return nil, "", err
@@ -537,3 +548,34 @@ func CheckProposalTxID(txid string, nonce, creator []byte) error {
 
 	return nil
 }
+
+// ComputeProposalBinding computes the binding of a proposal
+func ComputeProposalBinding(proposal *peer.Proposal) ([]byte, error) {
+	if proposal == nil {
+		return nil, fmt.Errorf("Porposal is nil")
+	}
+	if len(proposal.Header) == 0 {
+		return nil, fmt.Errorf("Proposal's Header is nil")
+	}
+
+	h, err := GetHeader(proposal.Header)
+	if err != nil {
+		return nil, err
+	}
+
+	return computeProposalBindingInternal(h.SignatureHeader.Nonce, h.SignatureHeader.Creator, h.ChannelHeader.Epoch)
+}
+
+func computeProposalBindingInternal(nonce, creator []byte, epoch uint64) ([]byte, error) {
+	epochBytes := make([]byte, 8)
+	binary.LittleEndian.PutUint64(epochBytes, epoch)
+
+	// TODO: add to genesis block the hash function used for the binding computation.
+	digest, err := factory.GetDefaultOrPanic().Hash(
+		append(append(nonce, creator...), epochBytes...),
+		&bccsp.SHA256Opts{})
+	if err != nil {
+		return nil, err
+	}
+	return digest, nil
+}

protos/peer/chaincodeshim.proto

@@ -44,7 +44,11 @@ func createCIS() *pb.ChaincodeInvocationSpec {
 
 func TestProposal(t *testing.T) {
 	// create a proposal from a ChaincodeInvocationSpec
-	prop, _, err := CreateChaincodeProposalWithTransient(common.HeaderType_ENDORSER_TRANSACTION, util.GetTestChainID(), createCIS(), []byte("creator"), []byte("transient"))
+	prop, _, err := CreateChaincodeProposalWithTransient(
+		common.HeaderType_ENDORSER_TRANSACTION,
+		util.GetTestChainID(), createCIS(),
+		[]byte("creator"),
+		map[string][]byte{"certx": []byte("transient")})
 	if err != nil {
 		t.Fatalf("Could not create chaincode proposal, err %s\n", err)
 		return
@@ -122,16 +126,17 @@ func TestProposal(t *testing.T) {
 		return
 	}
 
-	porposalContexd, err := GetChaincodeProposalContext(prop)
+	creator, transient, err := GetChaincodeProposalContext(prop)
 	if err != nil {
 		t.Fatalf("Failed getting chaincode proposal context [%s]", err)
 	}
-	if string(porposalContexd.Transient) != "transient" {
-		t.Fatalf("Failed checking Transient field. Invalid value, expectext 'transient', got [%s]", string(porposalContexd.Transient))
+	if string(creator) != "creator" {
+		t.Fatalf("Failed checking Creator field. Invalid value, expectext 'creator', got [%s]", string(creator))
 		return
 	}
-	if string(porposalContexd.Creator) != "creator" {
-		t.Fatalf("Failed checking Creator field. Invalid value, expectext 'creator', got [%s]", string(porposalContexd.Creator))
+	value, ok := transient["certx"]
+	if !ok || string(value) != "transient" {
+		t.Fatalf("Failed checking Transient field. Invalid value, expectext 'transient', got [%s]", string(value))
 		return
 	}
 }

protos/peer/configuration.pb.go

@@ -247,7 +247,7 @@ func GetBytesProposalPayloadForTx(payload *peer.ChaincodeProposalPayload, visibi
 	}
 
 	// strip the transient bytes off the payload - this needs to be done no matter the visibility mode
-	cppNoTransient := &peer.ChaincodeProposalPayload{Input: payload.Input, Transient: nil}
+	cppNoTransient := &peer.ChaincodeProposalPayload{Input: payload.Input, TransientMap: nil}
 	cppBytes, err := GetBytesChaincodeProposalPayload(cppNoTransient)
 	if err != nil {
 		return nil, errors.New("Failure while marshalling the ChaincodeProposalPayload!")