[FAB-6889] add channel ID to chaincode message

Chaincodes need the channel ID in the transaction context. This
CR follows the work in https://gerrit.hyperledger.org/r/#/c/14919.

Change-Id: I1914138d30db27d30ac5583cef38d13d60187832
Signed-off-by: Srinivasan Muralidharan <srinivasan.muralidharan99@gmail.com>

Author: muralisrini

shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeStub.java

@@ -71,6 +71,13 @@ public interface ChaincodeStub {
 	 */
 	String getTxId();
 
+	/**
+	 * Returns the channel id
+	 *
+	 * @return the channel id
+	 */
+	String getChannelId();
+
 	/**
 	 * Invoke another chaincode using the same transaction context.
 	 *

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

@@ -44,6 +44,7 @@
 class ChaincodeStubImpl implements ChaincodeStub {
 
 	private static final String UNSPECIFIED_KEY = new String(Character.toChars(0x000001));
+	private final String channelId;
 	private final String txId;
 	private final Handler handler;
 	private final List<ByteString> args;
@@ -54,7 +55,8 @@ class ChaincodeStubImpl implements ChaincodeStub {
 	private final byte[] binding;
 	private ChaincodeEvent event;
 
-	ChaincodeStubImpl(String txId, Handler handler, List<ByteString> args, SignedProposal signedProposal) {
+	ChaincodeStubImpl(String channelId, String txId, Handler handler, List<ByteString> args, SignedProposal signedProposal) {
+		this.channelId = channelId;
 		this.txId = txId;
 		this.handler = handler;
 		this.args = Collections.unmodifiableList(args);
@@ -146,26 +148,31 @@ public ChaincodeEvent getEvent() {
 		return event;
 	}
 
+	@Override
+	public String getChannelId() {
+		return channelId;
+	}
+
 	@Override
 	public String getTxId() {
 		return txId;
 	}
 
 	@Override
 	public byte[] getState(String key) {
-		return handler.getState(txId, key).toByteArray();
+		return handler.getState(channelId, txId, key).toByteArray();
 	}
 
 	@Override
 	public void putState(String key, byte[] value) {
 		if(key == null) throw new NullPointerException("key cannot be null");
 		if(key.length() == 0) throw new IllegalArgumentException("key cannot not be an empty string");
-		handler.putState(txId, key, ByteString.copyFrom(value));
+		handler.putState(channelId, txId, key, ByteString.copyFrom(value));
 	}
 
 	@Override
 	public void delState(String key) {
-		handler.deleteState(txId, key);
+		handler.deleteState(channelId, txId, key);
 	}
 
 	@Override
@@ -174,8 +181,8 @@ public QueryResultsIterator<KeyValue> getStateByRange(String startKey, String en
 		if (endKey == null || endKey.isEmpty()) endKey = UNSPECIFIED_KEY;
 		CompositeKey.validateSimpleKeys(startKey, endKey);
 
-		return new QueryResultsIteratorImpl<KeyValue>(this.handler, getTxId(),
-				handler.getStateByRange(getTxId(), startKey, endKey),
+		return new QueryResultsIteratorImpl<KeyValue>(this.handler, getChannelId(), getTxId(),
+				handler.getStateByRange(getChannelId(), getTxId(), startKey, endKey),
 				queryResultBytesToKv.andThen(KeyValueImpl::new)
 				);
 	}
@@ -210,16 +217,16 @@ public CompositeKey splitCompositeKey(String compositeKey) {
 
 	@Override
 	public QueryResultsIterator<KeyValue> getQueryResult(String query) {
-		return new QueryResultsIteratorImpl<KeyValue>(this.handler, getTxId(),
-				handler.getQueryResult(getTxId(), query),
+		return new QueryResultsIteratorImpl<KeyValue>(this.handler, getChannelId(), getTxId(),
+				handler.getQueryResult(getChannelId(), getTxId(), query),
 				queryResultBytesToKv.andThen(KeyValueImpl::new)
 				);
 	}
 
 	@Override
 	public QueryResultsIterator<KeyModification> getHistoryForKey(String key) {
-		return new QueryResultsIteratorImpl<KeyModification>(this.handler, getTxId(),
-				handler.getHistoryForKey(getTxId(), key),
+		return new QueryResultsIteratorImpl<KeyModification>(this.handler, getChannelId(), getTxId(),
+				handler.getHistoryForKey(getChannelId(), getTxId(), key),
 				queryResultBytesToKeyModification.andThen(KeyModificationImpl::new)
 				);
 	}
@@ -243,7 +250,7 @@ public Response invokeChaincode(final String chaincodeName, final List<byte[]> a
 		} else {
 			compositeName = chaincodeName;
 		}
-		return handler.invokeChaincode(this.txId, compositeName, args);
+		return handler.invokeChaincode(this.channelId, this.txId, compositeName, args);
 	}
 
 	@Override