complete refactor the code and add support for Fabric version 1.1.x

Author: Ivan Vankov (gatakka)

README.md

@@ -33,7 +33,7 @@ const (
 
 // ChainCode the fields necessary to execute operation over chaincode.
 type ChainCode struct {
-	Channel      *Channel
+	ChannelId    string
 	Name         string
 	Version      string
 	Type         ChainCodeType
@@ -59,7 +59,7 @@ func (c *ChainCode) toChainCodeArgs() ([][]byte) {
 
 // InstallRequest holds fields needed to install chaincode
 type InstallRequest struct {
-	Channel          *Channel
+	ChannelId        string
 	ChainCodeName    string
 	ChainCodeVersion string
 	ChainCodeType    ChainCodeType
@@ -68,6 +68,13 @@ type InstallRequest struct {
 	Libraries        []ChaincodeLibrary
 }
 
+type CollectionConfig struct {
+	Name               string
+	RequiredPeersCount int32
+	MaximumPeersCount  int32
+	Organizations      []string
+}
+
 type ChaincodeLibrary struct {
 	Namespace string
 	SrcPath   string
@@ -82,7 +89,7 @@ type ChainCodesResponse struct {
 
 // createInstallProposal read chaincode from provided source and namespace, pack it and generate install proposal
 // transaction. Transaction is not send from this func
-func createInstallProposal(identity *Identity, req *InstallRequest) (*transactionProposal, error) {
+func createInstallProposal(identity Identity, req *InstallRequest) (*transactionProposal, error) {
 
 	var packageBytes []byte
 	var err error
@@ -109,13 +116,13 @@ func createInstallProposal(identity *Identity, req *InstallRequest) (*transactio
 		return nil, err
 	}
 
-	spec, err := chainCodeInvocationSpec(&ChainCode{Type: req.ChainCodeType,
+	spec, err := chainCodeInvocationSpec(ChainCode{Type: req.ChainCodeType,
 		Name: LSCC,
 		Args: []string{"install"},
 		ArgBytes: depSpec,
 	})
 
-	creator, err := marshalProtoIdentity(identity, req.Channel)
+	creator, err := marshalProtoIdentity(identity)
 	if err != nil {
 		return nil, err
 	}
@@ -125,7 +132,7 @@ func createInstallProposal(identity *Identity, req *InstallRequest) (*transactio
 	}
 	ccHdrExt := &peer.ChaincodeHeaderExtension{ChaincodeId: &peer.ChaincodeID{Name: LSCC}}
 
-	channelHeaderBytes, err := channelHeader(common.HeaderType_ENDORSER_TRANSACTION, txId, req.Channel, 0, ccHdrExt)
+	channelHeaderBytes, err := channelHeader(common.HeaderType_ENDORSER_TRANSACTION, txId, req.ChannelId, 0, ccHdrExt)
 	if err != nil {
 		return nil, err
 	}
@@ -158,7 +165,7 @@ func createInstallProposal(identity *Identity, req *InstallRequest) (*transactio
 
 // createInstantiateProposal creates instantiate proposal transaction for already installed chaincode.
 // transaction is not send from this func
-func createInstantiateProposal(identity *Identity, req *ChainCode, operation string) (*transactionProposal, error) {
+func createInstantiateProposal(identity Identity, req *ChainCode, operation string, collectionConfig []byte) (*transactionProposal, error) {
 	if operation != "deploy" && operation != "upgrade" {
 		return nil, fmt.Errorf("install proposall accept only 'deploy' and 'upgrade' operations")
 	}
@@ -174,7 +181,7 @@ func createInstantiateProposal(identity *Identity, req *ChainCode, operation str
 		return nil, err
 	}
 
-	policy, err := defaultPolicy(req.Channel.MspId)
+	policy, err := defaultPolicy(identity.MspId)
 	if err != nil {
 		return nil, err
 	}
@@ -183,18 +190,25 @@ func createInstantiateProposal(identity *Identity, req *ChainCode, operation str
 		return nil, err
 	}
 
-	spec, err := chainCodeInvocationSpec(&ChainCode{
-		Type: req.Type,
-		Name: LSCC,
-		rawArgs: [][]byte{
-			[]byte(operation),
-			[]byte(req.Channel.ChannelName),
-			depSpec, marshPolicy,
-			[]byte("escc"), []byte("vscc"),
-		},
+	args := [][]byte{
+		[]byte(operation),
+		[]byte(req.ChannelId),
+		depSpec,
+		marshPolicy,
+		[]byte("escc"),
+		[]byte("vscc"),
+	}
+	if len(collectionConfig) > 0 {
+		args = append(args, collectionConfig)
+	}
+
+	spec, err := chainCodeInvocationSpec(ChainCode{
+		Type:    req.Type,
+		Name:    LSCC,
+		rawArgs: args,
 	})
 
-	creator, err := marshalProtoIdentity(identity, req.Channel)
+	creator, err := marshalProtoIdentity(identity)
 	if err != nil {
 		return nil, err
 	}
@@ -204,7 +218,7 @@ func createInstantiateProposal(identity *Identity, req *ChainCode, operation str
 	}
 	headerExtension := &peer.ChaincodeHeaderExtension{ChaincodeId: &peer.ChaincodeID{Name: LSCC}}
 
-	channelHeaderBytes, err := channelHeader(common.HeaderType_ENDORSER_TRANSACTION, txId, req.Channel, 0, headerExtension)
+	channelHeaderBytes, err := channelHeader(common.HeaderType_ENDORSER_TRANSACTION, txId, req.ChannelId, 0, headerExtension)
 	if err != nil {
 		return nil, err
 	}

caclient.go

@@ -15,14 +15,6 @@ const LSCC = "lscc"
 const QSCC = "qscc"
 const CSCC = "cscc"
 
-// Channel define channel
-type Channel struct {
-	// ChannelName is channel name over which operations will be executed.
-	ChannelName string
-	// MspId identify which member service in peer must be used to verify operation.
-	MspId string
-}
-
 // QueryChannelsResponse holds the result from querying which channels peer is currently joined
 type QueryChannelsResponse struct {
 	PeerName string
@@ -50,7 +42,7 @@ func decodeChannelFromFs(path string) (*common.Envelope, error) {
 }
 
 // buildAndSignChannelConfig take channel config payload and prepare the structure need for join transaction
-func buildAndSignChannelConfig(identity *Identity, configPayload []byte, crypto CryptoSuite, channel *Channel) (*common.Envelope, error) {
+func buildAndSignChannelConfig(identity Identity, configPayload []byte, crypto CryptoSuite,channelId string) (*common.Envelope, error) {
 
 	pl := &common.Payload{}
 	if err := proto.Unmarshal(configPayload, pl); err != nil {
@@ -62,7 +54,7 @@ func buildAndSignChannelConfig(identity *Identity, configPayload []byte, crypto
 	if err != nil {
 		return nil, err
 	}
-	creator, err := marshalProtoIdentity(identity, channel)
+	creator, err := marshalProtoIdentity(identity)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +78,7 @@ func buildAndSignChannelConfig(identity *Identity, configPayload []byte, crypto
 	configSignature.Signature = sig
 	configUpdateEnvelope.Signatures = append(configUpdateEnvelope.GetSignatures(), configSignature)
 
-	channelHeaderBytes, err := channelHeader(common.HeaderType_CONFIG_UPDATE, txId, channel,0,nil)
+	channelHeaderBytes, err := channelHeader(common.HeaderType_CONFIG_UPDATE, txId, channelId,0,nil)
 	header := header(sigHeaderBytes, channelHeaderBytes)
 
 	envelopeBytes, err := proto.Marshal(configUpdateEnvelope)