FABN-1415 NodeSDK update protos

Pull in new protos and make code updates to use
the new policy type location.

Signed-off-by: Bret Harrison <[email protected]>
Change-Id: I8d75dabdef72073c62a40b24aea630011d07acd9

fabric-client/lib/Chaincode.js

@@ -24,6 +24,7 @@ const Policy = require('./Policy.js');
 const CollectionConfig = require('./SideDB.js');
 const TransactionID = require('./TransactionID');
 const fabric_protos = require('fabric-protos').protos;
+const fabric_common_protos = require('fabric-protos').common;
 const lifecycle_protos = require('fabric-protos').lifecycle;
 
 /**
@@ -384,7 +385,7 @@ const Chaincode = class {
 		const method = 'setEndorsementPolicyDefinition';
 		logger.debug('%s - start', method);
 
-		const application_policy = new fabric_protos.ApplicationPolicy();
+		const application_policy = new fabric_common_protos.ApplicationPolicy();
 
 		if (typeof policy === 'string') {
 			logger.debug('%s - have a policy reference :: %s', method, policy);

fabric-protos/bundle.json

@@ -878,6 +878,32 @@
                         }
                     ]
                 },
+                {
+                    "name": "ApplicationPolicy",
+                    "syntax": "proto3",
+                    "fields": [
+                        {
+                            "rule": "optional",
+                            "type": "SignaturePolicyEnvelope",
+                            "name": "signature_policy",
+                            "id": 1,
+                            "oneof": "Type"
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "string",
+                            "name": "channel_config_policy_reference",
+                            "id": 2,
+                            "oneof": "Type"
+                        }
+                    ],
+                    "oneofs": {
+                        "Type": [
+                            1,
+                            2
+                        ]
+                    }
+                },
                 {
                     "name": "CollectionConfigPackage",
                     "syntax": "proto3",
@@ -953,6 +979,12 @@
                             "type": "bool",
                             "name": "member_only_write",
                             "id": 7
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "ApplicationPolicy",
+                            "name": "endorsement_policy",
+                            "id": 8
                         }
                     ]
                 },
@@ -974,36 +1006,6 @@
                         ]
                     }
                 },
-                {
-                    "name": "CollectionCriteria",
-                    "syntax": "proto3",
-                    "fields": [
-                        {
-                            "rule": "optional",
-                            "type": "string",
-                            "name": "channel",
-                            "id": 1
-                        },
-                        {
-                            "rule": "optional",
-                            "type": "string",
-                            "name": "tx_id",
-                            "id": 2
-                        },
-                        {
-                            "rule": "optional",
-                            "type": "string",
-                            "name": "collection",
-                            "id": 3
-                        },
-                        {
-                            "rule": "optional",
-                            "type": "string",
-                            "name": "namespace",
-                            "id": 4
-                        }
-                    ]
-                },
                 {
                     "name": "LastConfig",
                     "syntax": "proto3",
@@ -1738,7 +1740,8 @@
             "fields": [],
             "syntax": "proto2",
             "options": {
-                "go_package": "github.com/hyperledger/fabric-protos-go/gossip"
+                "go_package": "github.com/hyperledger/fabric-protos-go/gossip",
+                "java_package": "org.hyperledger.fabric.protos.gossip"
             },
             "messages": [
                 {
@@ -3027,7 +3030,8 @@
             "fields": [],
             "syntax": "proto2",
             "options": {
-                "go_package": "github.com/hyperledger/fabric-protos-go/discovery"
+                "go_package": "github.com/hyperledger/fabric-protos-go/discovery",
+                "java_package": "org.hyperledger.fabric.protos.discovery"
             },
             "messages": [
                 {
@@ -4654,6 +4658,78 @@
                         }
                     ]
                 },
+                {
+                    "name": "CDSData",
+                    "syntax": "proto3",
+                    "fields": [
+                        {
+                            "rule": "optional",
+                            "type": "bytes",
+                            "name": "hash",
+                            "id": 1
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "bytes",
+                            "name": "metadatahash",
+                            "id": 2
+                        }
+                    ]
+                },
+                {
+                    "name": "ChaincodeData",
+                    "syntax": "proto3",
+                    "fields": [
+                        {
+                            "rule": "optional",
+                            "type": "string",
+                            "name": "name",
+                            "id": 1
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "string",
+                            "name": "version",
+                            "id": 2
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "string",
+                            "name": "escc",
+                            "id": 3
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "string",
+                            "name": "vscc",
+                            "id": 4
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "common.SignaturePolicyEnvelope",
+                            "name": "policy",
+                            "id": 5
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "bytes",
+                            "name": "data",
+                            "id": 6
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "bytes",
+                            "name": "id",
+                            "id": 7
+                        },
+                        {
+                            "rule": "optional",
+                            "type": "common.SignaturePolicyEnvelope",
+                            "name": "instantiation_policy",
+                            "id": 8
+                        }
+                    ]
+                },
                 {
                     "name": "SignedProposal",
                     "syntax": "proto3",
@@ -5445,6 +5521,9 @@
                 {
                     "name": "ApplicationPolicy",
                     "syntax": "proto3",
+                    "options": {
+                        "deprecated": true
+                    },
                     "fields": [
                         {
                             "rule": "optional",
@@ -5644,6 +5723,19 @@
                         }
                     }
                 },
+                {
+                    "name": "Chaincode",
+                    "options": {},
+                    "rpc": {
+                        "Connect": {
+                            "request": "ChaincodeMessage",
+                            "request_stream": true,
+                            "response": "ChaincodeMessage",
+                            "response_stream": true,
+                            "options": {}
+                        }
+                    }
+                },
                 {
                     "name": "Endorser",
                     "options": {},

fabric-protos/package.json

@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "grpc": "1.23.3",
-    "protobufjs": "5.0.3"
+    "protobufjs": "^5.0.3"
   },
   "devDependencies": {
     "cpx": "^1.5.0",

fabric-protos/protos/common/collection.proto

@@ -59,6 +59,9 @@ message StaticCollectionConfig {
     // write the data (if set to false, for example if you want to implement more granular
     // access logic in the chaincode)
     bool member_only_write = 7;
+    // a reference to a policy residing / managed in the config block
+    // to define the endorsement policy for this collection
+    ApplicationPolicy endorsement_policy= 8;
 }
 
 
@@ -76,13 +79,3 @@ message CollectionPolicyConfig {
 //        string reference = 2;
     }
 }
-
-
-// CollectionCriteria defines an element of a private data that corresponds
-// to a certain transaction and collection
-message CollectionCriteria {
-    string channel = 1;
-    string tx_id = 2;
-    string collection = 3;
-    string namespace = 4;
-}

fabric-protos/protos/common/policies.proto

@@ -65,3 +65,19 @@ message ImplicitMetaPolicy {
     string sub_policy = 1;
     Rule rule = 2;
 }
+
+// ApplicationPolicy captures the diffenrent policy types that
+// are set and evaluted at the application level.
+message ApplicationPolicy {
+    oneof Type {
+        // SignaturePolicy type is used if the policy is specified as
+        // a combination (using threshold gates) of signatures from MSP
+        // principals
+        SignaturePolicyEnvelope signature_policy = 1;
+
+        // ChannelConfigPolicyReference is used when the policy is
+        // specified as a string that references a policy defined in
+        // the configuration of the channel
+        string channel_config_policy_reference = 2;
+    }
+}

fabric-protos/protos/discovery/protocol.proto

@@ -4,7 +4,8 @@
 
 syntax = "proto3";
 
-option go_package = "github.com/hyperledger/fabric-protos-go/discovery" ;
+option go_package = "github.com/hyperledger/fabric-protos-go/discovery";
+option java_package = "org.hyperledger.fabric.protos.discovery";
 
 package discovery;
 

fabric-protos/protos/gossip/message.proto

@@ -4,7 +4,8 @@
 
 syntax = "proto3";
 
-option go_package = "github.com/hyperledger/fabric-protos-go/gossip" ;
+option go_package = "github.com/hyperledger/fabric-protos-go/gossip";
+option java_package = "org.hyperledger.fabric.protos.gossip";
 
 package gossip;
 

fabric-protos/protos/peer/chaincode.proto

@@ -9,6 +9,8 @@ option go_package = "github.com/hyperledger/fabric-protos-go/peer";
 
 package protos;
 
+import "common/policies.proto";
+
 //ChaincodeID contains the path as specified by the deploy transaction
 //that created it as well as the hashCode that is generated by the
 //system for the path. From the user level (ie, CLI, REST API and so on)
@@ -85,3 +87,42 @@ message ChaincodeInvocationSpec {
 message LifecycleEvent {
     string chaincode_name = 1;
 }
+
+// CDSData is data stored in the LSCC on instantiation of a CC
+// for CDSPackage.  This needs to be serialized for ChaincodeData
+// hence the protobuf format
+message CDSData {
+    bytes hash = 1; // hash of ChaincodeDeploymentSpec.code_package
+    bytes metadatahash = 2; // hash of ChaincodeID.name + ChaincodeID.version
+}
+
+// ChaincodeData defines the datastructure for chaincodes to be serialized by proto
+// Type provides an additional check by directing to use a specific package after instantiation
+// Data is Type specific (see CDSPackage and SignedCDSPackage)
+message ChaincodeData {
+
+    // Name of the chaincode
+    string name = 1;
+
+    // Version of the chaincode
+    string version = 2;
+
+    // Escc for the chaincode instance
+    string escc = 3;
+
+    // Vscc for the chaincode instance
+    string vscc = 4;
+
+    // Policy endorsement policy for the chaincode instance
+    common.SignaturePolicyEnvelope policy = 5;
+
+    // Data data specific to the package
+    bytes data = 6;
+
+    // Id of the chaincode that's the unique fingerprint for the CC This is not
+    // currently used anywhere but serves as a good eyecatcher
+    bytes id = 7;
+
+    // InstantiationPolicy for the chaincode
+    common.SignaturePolicyEnvelope instantiation_policy = 8;
+}

fabric-protos/protos/peer/chaincode_shim.proto

@@ -177,3 +177,9 @@ message StateMetadataResult {
 service ChaincodeSupport {
     rpc Register(stream ChaincodeMessage) returns (stream ChaincodeMessage);
 }
+
+// Chaincode as a server - peer establishes a connection to the chaincode as a client
+// Currently only supports a stream connection.
+service Chaincode {
+    rpc Connect(stream ChaincodeMessage) returns (stream ChaincodeMessage);
+}

fabric-protos/protos/peer/policy.proto

@@ -14,6 +14,7 @@ import "common/policies.proto";
 // ApplicationPolicy captures the diffenrent policy types that
 // are set and evaluted at the application level.
 message ApplicationPolicy {
+    option deprecated = true;
     oneof Type {
         // SignaturePolicy type is used if the policy is specified as
         // a combination (using threshold gates) of signatures from MSP