[FAB-8346] sync chaincode proto files w/ fabric

Change-Id: I5ca3482ac98d53937d011cee85f67941a9bd119d
Signed-off-by: Luis Sanchez <sanchezl@us.ibm.com>

Author: Luis Sanchez

shim/src/main/java/org/hyperledger/fabric/shim/impl/Handler.java

@@ -488,7 +488,7 @@ private static ChaincodeMessage newGetStateEventMessage(final String channelId,
 	}
 
 	private static ChaincodeMessage newPutStateEventMessage(final String channelId, final String txId, final String key, final ByteString value) {
-		return newEventMessage(PUT_STATE, channelId, txId, PutStateInfo.newBuilder()
+		return newEventMessage(PUT_STATE, channelId, txId, PutState.newBuilder()
 				.setKey(key)
 				.setValue(value)
 				.build().toByteString());

shim/src/main/proto/common/common.proto

@@ -32,6 +32,7 @@ enum Status {
     NOT_FOUND = 404;
     REQUEST_ENTITY_TOO_LARGE = 413;
     INTERNAL_SERVER_ERROR = 500;
+    NOT_IMPLEMENTED = 501;
     SERVICE_UNAVAILABLE = 503;
 }
 
@@ -43,6 +44,7 @@ enum HeaderType {
     ORDERER_TRANSACTION = 4;       // Used internally by the orderer for management
     DELIVER_SEEK_INFO = 5;         // Used as the type for Envelope messages submitted to instruct the Deliver API to seek
     CHAINCODE_PACKAGE = 6;         // Used for packaging chaincode artifacts for install
+    PEER_RESOURCE_UPDATE = 7;      // Used for encoding updates to the peer resource configuration
 }
 
 // This enum enlists indexes of the block metadata array
@@ -108,10 +110,14 @@ message ChannelHeader {
 
     // Extension that may be attached based on the header type
     bytes extension = 7;
+
+    // If mutual TLS is employed, this represents
+    // the hash of the client's TLS certificate
+    bytes tls_cert_hash = 8;
 }
 
 message SignatureHeader {
-    // Creator of the message, specified as a certificate chain
+    // Creator of the message, a marshaled msp.SerializedIdentity
     bytes creator = 1;
 
     // Arbitrary number that may only be used once. Can be used to detect replay attacks.

shim/src/main/proto/peer/chaincode_shim.proto

@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2017 All Rights Reserved.
+Copyright IBM Corp. 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.
+SPDX-License-Identifier: Apache-2.0
 */
 
 syntax = "proto3";
@@ -55,7 +45,7 @@ message ChaincodeMessage {
 
     SignedProposal proposal = 5;
 
-    //event emmited by chaincode. Used only with Init or Invoke.
+    //event emitted by chaincode. Used only with Init or Invoke.
     // This event is then stored (currently)
     //with Block.NonHashData.TransactionResult
     ChaincodeEvent chaincode_event = 6;
@@ -64,18 +54,34 @@ message ChaincodeMessage {
     string channel_id = 7;
 }
 
-message PutStateInfo {
+// TODO: We need to finalize the design on chaincode container
+// compatibility upon upgrade, see FAB-5777.
+
+message GetState {
+    string key = 1;
+    string collection = 2;
+}
+
+message PutState {
     string key = 1;
     bytes value = 2;
+    string collection = 3;
+}
+
+message DelState {
+    string key = 1;
+    string collection = 2;
 }
 
 message GetStateByRange {
     string startKey = 1;
     string endKey = 2;
+    string collection = 3;
 }
 
 message GetQueryResult {
     string query = 1;
+    string collection = 2;
 }
 
 message GetHistoryForKey {