FABJ-500: Update to latest protobufs (#26)

bestbeforetoday · andrew-coleman · commit 3db1a01d648b · 2019-11-25T08:43:30.000Z
common/collection.proto moved to peer/collection.proto.

Signed-off-by: Mark S. Lewis &lt;mark_lewis@uk.ibm.com&gt;
diff --git a/src/main/java/org/hyperledger/fabric/sdk/ChaincodeCollectionConfiguration.java b/src/main/java/org/hyperledger/fabric/sdk/ChaincodeCollectionConfiguration.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
@@ -36,11 +35,11 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hyperledger.fabric.protos.common.Collection;
 import org.hyperledger.fabric.protos.common.MspPrincipal.MSPPrincipal;
 import org.hyperledger.fabric.protos.common.MspPrincipal.MSPRole;
 import org.hyperledger.fabric.protos.common.Policies;
 import org.hyperledger.fabric.protos.common.Policies.SignaturePolicy;
+import org.hyperledger.fabric.protos.peer.Collection;
 import org.hyperledger.fabric.sdk.exception.ChaincodeCollectionConfigurationException;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
 import org.yaml.snakeyaml.Yaml;
diff --git a/src/main/java/org/hyperledger/fabric/sdk/Channel.java b/src/main/java/org/hyperledger/fabric/sdk/Channel.java
@@ -4107,7 +4107,7 @@ public Collection<LifecycleCheckCommitReadinessProposalResponse> sendLifecycleCh
 
                 String collectionData = "null";
 
-                final org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage chaincodeCollectionConfiguration = lifecycleCheckCommitReadinessRequest.getCollectionConfigPackage();
+                final org.hyperledger.fabric.protos.peer.Collection.CollectionConfigPackage chaincodeCollectionConfiguration = lifecycleCheckCommitReadinessRequest.getCollectionConfigPackage();
                 if (null != chaincodeCollectionConfiguration) {
                     final byte[] asBytes = chaincodeCollectionConfiguration.toByteArray();
                     if (null != asBytes) {
@@ -4152,7 +4152,7 @@ public Collection<LifecycleCheckCommitReadinessProposalResponse> sendLifecycleCh
                 lifecycleCheckCommitReadinessBuilder.setValidationParameter(validationParameter);
             }
 
-            org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage collectionConfigPackage = lifecycleCheckCommitReadinessRequest.getCollectionConfigPackage();
+            org.hyperledger.fabric.protos.peer.Collection.CollectionConfigPackage collectionConfigPackage = lifecycleCheckCommitReadinessRequest.getCollectionConfigPackage();
 
             if (null != collectionConfigPackage) {
                 lifecycleCheckCommitReadinessBuilder.setCollections(collectionConfigPackage);
diff --git a/src/main/java/org/hyperledger/fabric/sdk/CollectionConfigPackage.java b/src/main/java/org/hyperledger/fabric/sdk/CollectionConfigPackage.java
@@ -29,7 +29,7 @@
 public class CollectionConfigPackage {
 
     private final ByteString collectionConfigBytes;
-    private org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage cp;
+    private org.hyperledger.fabric.protos.peer.Collection.CollectionConfigPackage cp;
 
     CollectionConfigPackage(ByteString collectionConfig) {
         this.collectionConfigBytes = collectionConfig;
@@ -43,9 +43,9 @@ public class CollectionConfigPackage {
      * @throws InvalidProtocolBufferException
      */
 
-    public org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage getCollectionConfigPackage() throws InvalidProtocolBufferException {
+    public org.hyperledger.fabric.protos.peer.Collection.CollectionConfigPackage getCollectionConfigPackage() throws InvalidProtocolBufferException {
         if (null == cp) {
-            cp = org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage.parseFrom(collectionConfigBytes);
+            cp = org.hyperledger.fabric.protos.peer.Collection.CollectionConfigPackage.parseFrom(collectionConfigBytes);
         }
 
         return cp;
@@ -60,7 +60,7 @@ public org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage g
      */
     public Collection<CollectionConfig> getCollectionConfigs() throws InvalidProtocolBufferException {
         List<CollectionConfig> ret = new LinkedList<>();
-        for (org.hyperledger.fabric.protos.common.Collection.CollectionConfig collectionConfig : getCollectionConfigPackage().getConfigList()) {
+        for (org.hyperledger.fabric.protos.peer.Collection.CollectionConfig collectionConfig : getCollectionConfigPackage().getConfigList()) {
             ret.add(new CollectionConfig(collectionConfig));
 
         }
@@ -73,7 +73,7 @@ public Collection<CollectionConfig> getCollectionConfigs() throws InvalidProtoco
      */
 
     public static class CollectionConfig {
-        final org.hyperledger.fabric.protos.common.Collection.CollectionConfig collectionConfig;
+        final org.hyperledger.fabric.protos.peer.Collection.CollectionConfig collectionConfig;
 
         /**
          * Name of the collection.
@@ -112,9 +112,9 @@ public long getBlockToLive() {
             return getStaticCollectionConfig.getBlockToLive();
         }
 
-        final org.hyperledger.fabric.protos.common.Collection.StaticCollectionConfig getStaticCollectionConfig;
+        final org.hyperledger.fabric.protos.peer.Collection.StaticCollectionConfig getStaticCollectionConfig;
 
-        CollectionConfig(org.hyperledger.fabric.protos.common.Collection.CollectionConfig collectionConfig) {
+        CollectionConfig(org.hyperledger.fabric.protos.peer.Collection.CollectionConfig collectionConfig) {
             this.collectionConfig = collectionConfig;
             this.getStaticCollectionConfig = collectionConfig.getStaticCollectionConfig();
 
@@ -125,8 +125,8 @@ public long getBlockToLive() {
          *
          * @return The collection information returned directly from the peer.
          */
-        public org.hyperledger.fabric.protos.common.Collection.CollectionConfig getCollectionConfig() {
-            org.hyperledger.fabric.protos.common.Collection.StaticCollectionConfig staticCollectionConfig = collectionConfig.getStaticCollectionConfig();
+        public org.hyperledger.fabric.protos.peer.Collection.CollectionConfig getCollectionConfig() {
+            org.hyperledger.fabric.protos.peer.Collection.StaticCollectionConfig staticCollectionConfig = collectionConfig.getStaticCollectionConfig();
 
             return this.collectionConfig;
         }
diff --git a/src/main/java/org/hyperledger/fabric/sdk/LifecycleCheckCommitReadinessRequest.java b/src/main/java/org/hyperledger/fabric/sdk/LifecycleCheckCommitReadinessRequest.java
@@ -9,7 +9,7 @@
 package org.hyperledger.fabric.sdk;
 
 import com.google.protobuf.ByteString;
-import org.hyperledger.fabric.protos.common.Collection;
+import org.hyperledger.fabric.protos.peer.Collection;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
 import org.hyperledger.fabric.sdk.helper.Config;
 
diff --git a/src/main/java/org/hyperledger/fabric/sdk/LifecycleQueryChaincodeDefinitionProposalResponse.java b/src/main/java/org/hyperledger/fabric/sdk/LifecycleQueryChaincodeDefinitionProposalResponse.java
@@ -9,7 +9,7 @@
 package org.hyperledger.fabric.sdk;
 
 import com.google.protobuf.ByteString;
-import org.hyperledger.fabric.protos.common.Collection;
+import org.hyperledger.fabric.protos.peer.Collection;
 import org.hyperledger.fabric.protos.peer.ProposalResponsePackage;
 import org.hyperledger.fabric.protos.peer.lifecycle.Lifecycle;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
diff --git a/src/main/java/org/hyperledger/fabric/sdk/LifecycleQueryChaincodeDefinitionsResult.java b/src/main/java/org/hyperledger/fabric/sdk/LifecycleQueryChaincodeDefinitionsResult.java
@@ -7,7 +7,7 @@
 package org.hyperledger.fabric.sdk;
 
 import com.google.protobuf.ByteString;
-import org.hyperledger.fabric.protos.common.Collection;
+import org.hyperledger.fabric.protos.peer.Collection;
 import org.hyperledger.fabric.protos.peer.lifecycle.Lifecycle;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
 import org.hyperledger.fabric.sdk.exception.ProposalException;
diff --git a/src/main/java/org/hyperledger/fabric/sdk/transaction/LifecycleApproveChaincodeDefinitionForMyOrgProposalBuilder.java b/src/main/java/org/hyperledger/fabric/sdk/transaction/LifecycleApproveChaincodeDefinitionForMyOrgProposalBuilder.java
@@ -14,7 +14,7 @@
 import com.google.protobuf.ByteString;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hyperledger.fabric.protos.common.Collection.CollectionConfigPackage;
+import org.hyperledger.fabric.protos.peer.Collection.CollectionConfigPackage;
 import org.hyperledger.fabric.protos.peer.ProposalPackage;
 import org.hyperledger.fabric.protos.peer.lifecycle.Lifecycle;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
diff --git a/src/main/java/org/hyperledger/fabric/sdk/transaction/LifecycleCheckCommitReadinessBuilder.java b/src/main/java/org/hyperledger/fabric/sdk/transaction/LifecycleCheckCommitReadinessBuilder.java
@@ -12,7 +12,7 @@
 import java.util.List;
 
 import com.google.protobuf.ByteString;
-import org.hyperledger.fabric.protos.common.Collection;
+import org.hyperledger.fabric.protos.peer.Collection;
 import org.hyperledger.fabric.protos.peer.ProposalPackage;
 import org.hyperledger.fabric.protos.peer.lifecycle.Lifecycle;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
diff --git a/src/main/java/org/hyperledger/fabric/sdk/transaction/LifecycleCommitChaincodeDefinitionProposalBuilder.java b/src/main/java/org/hyperledger/fabric/sdk/transaction/LifecycleCommitChaincodeDefinitionProposalBuilder.java
@@ -14,7 +14,7 @@
 import com.google.protobuf.ByteString;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hyperledger.fabric.protos.common.Collection;
+import org.hyperledger.fabric.protos.peer.Collection;
 import org.hyperledger.fabric.protos.peer.ProposalPackage;
 import org.hyperledger.fabric.protos.peer.lifecycle.Lifecycle;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
diff --git a/src/main/proto/common/policies.proto b/src/main/proto/common/policies.proto
@@ -65,3 +65,20 @@ 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 {
+    option deprecated = true;
+    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;
+    }
+}
diff --git a/src/main/proto/gossip/message.proto b/src/main/proto/gossip/message.proto
@@ -9,7 +9,7 @@ option java_package = "org.hyperledger.fabric.protos.gossip";
 
 package gossip;
 
-import "common/collection.proto";
+import "peer/collection.proto";
 
 // Gossip
 service Gossip {
@@ -257,7 +257,7 @@ message PrivatePayload {
     string tx_id                = 3;
     bytes private_rwset         = 4;
     uint64 private_sim_height  = 5;
-    common.CollectionConfigPackage collection_configs = 6;
+    protos.CollectionConfigPackage collection_configs = 6;
 }
 
 // Membership messages
diff --git a/src/main/proto/peer/chaincode.proto b/src/main/proto/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;
+}
diff --git a/src/main/proto/peer/chaincode_shim.proto b/src/main/proto/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);
+}
diff --git a/src/main/proto/peer/collection.proto b/src/main/proto/peer/collection.proto
@@ -4,12 +4,13 @@
 
 syntax = "proto3";
 
-option go_package = "github.com/hyperledger/fabric-protos-go/common";
-option java_package = "org.hyperledger.fabric.protos.common";
+option go_package = "github.com/hyperledger/fabric-protos-go/peer";
+option java_package = "org.hyperledger.fabric.protos.peer";
 
-package common;
+package protos;
 
 import "common/policies.proto";
+import "peer/policy.proto";
 
 // CollectionConfigPackage represents an array of CollectionConfig
 // messages; the extra struct is required because repeated oneof is
@@ -59,6 +60,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;
 }
 
 
@@ -69,20 +73,10 @@ message StaticCollectionConfig {
 message CollectionPolicyConfig {
     oneof payload {
         // Initially, only a signature policy is supported.
-        SignaturePolicyEnvelope signature_policy = 1;
+        common.SignaturePolicyEnvelope signature_policy = 1;
         // Later, the SignaturePolicy will be replaced by a Policy.
         //        Policy policy = 1;
         // A reference to a Policy is planned to be added later.
 //        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;
-}
diff --git a/src/main/proto/peer/lifecycle/lifecycle.proto b/src/main/proto/peer/lifecycle/lifecycle.proto
@@ -9,7 +9,7 @@ option go_package = "github.com/hyperledger/fabric-protos-go/peer/lifecycle";
 
 package lifecycle;
 
-import "common/collection.proto";
+import "peer/collection.proto";
 
 // InstallChaincodeArgs is the message used as the argument to
 // '_lifecycle.InstallChaincode'.
@@ -97,7 +97,7 @@ message ApproveChaincodeDefinitionForMyOrgArgs {
     string endorsement_plugin = 4;
     string validation_plugin = 5;
     bytes validation_parameter = 6;
-    common.CollectionConfigPackage collections = 7;
+    protos.CollectionConfigPackage collections = 7;
     bool init_required = 8;
     ChaincodeSource source = 9;
 }
@@ -130,7 +130,7 @@ message CommitChaincodeDefinitionArgs {
     string endorsement_plugin = 4;
     string validation_plugin = 5;
     bytes validation_parameter = 6;
-    common.CollectionConfigPackage collections = 7;
+    protos.CollectionConfigPackage collections = 7;
     bool init_required = 8;
 }
 
@@ -149,7 +149,7 @@ message CheckCommitReadinessArgs {
     string endorsement_plugin = 4;
     string validation_plugin = 5;
     bytes validation_parameter = 6;
-    common.CollectionConfigPackage collections = 7;
+    protos.CollectionConfigPackage collections = 7;
     bool init_required = 8;
 }
 
@@ -175,7 +175,7 @@ message QueryChaincodeDefinitionResult {
     string endorsement_plugin = 3;
     string validation_plugin = 4;
     bytes validation_parameter = 5;
-    common.CollectionConfigPackage collections = 6;
+    protos.CollectionConfigPackage collections = 6;
     bool init_required = 7;
     map<string,bool> approvals = 8;
 }
@@ -194,7 +194,7 @@ message QueryChaincodeDefinitionsResult {
         string endorsement_plugin = 4;
         string validation_plugin = 5;
         bytes validation_parameter = 6;
-        common.CollectionConfigPackage collections = 7;
+        protos.CollectionConfigPackage collections = 7;
         bool init_required = 8;
     }
     repeated ChaincodeDefinition chaincode_definitions = 1;
diff --git a/src/main/proto/peer/transaction.proto b/src/main/proto/peer/transaction.proto
@@ -13,20 +13,6 @@ package protos;
 import "peer/proposal_response.proto";
 import "common/common.proto";
 
-// This message is necessary to facilitate the verification of the signature
-// (in the signature field) over the bytes of the transaction (in the
-// transactionBytes field).
-message SignedTransaction {
-    // The bytes of the Transaction. NDD
-    bytes transaction_bytes = 1;
-
-    // Signature of the transactionBytes The public key of the signature is in
-    // the header field of TransactionAction There might be multiple
-    // TransactionAction, so multiple headers, but there should be same
-    // transactor identity (cert) in all headers
-    bytes signature = 2;
-}
-
 // ProcessedTransaction wraps an Envelope that includes a transaction along with an indication
 // of whether the transaction was validated or invalidated by committing peer.
 // The use case is that GetTransactionByID API needs to retrieve the transaction Envelope
diff --git a/src/main/proto/transientstore/transientstore.proto b/src/main/proto/transientstore/transientstore.proto
@@ -10,13 +10,13 @@ option go_package = "github.com/hyperledger/fabric-protos-go/transientstore";
 option java_package = "org.hyperledger.fabric.protos.transientstore";
 
 import "ledger/rwset/rwset.proto";
-import "common/collection.proto";
+import "peer/collection.proto";
 
 // TxPvtReadWriteSetWithConfigInfo encapsulates the transaction's private
 // read-write set and additional information about the configurations such as
 // the latest collection config when the transaction is simulated
 message TxPvtReadWriteSetWithConfigInfo {
     uint64 endorsed_at = 1;
     rwset.TxPvtReadWriteSet pvt_rwset = 2;
-    map<string, common.CollectionConfigPackage> collection_configs = 3;
+    map<string, protos.CollectionConfigPackage> collection_configs = 3;
 }
diff --git a/src/test/java/org/hyperledger/fabric/sdk/ChaincodeCollectionConfigTest.java b/src/test/java/org/hyperledger/fabric/sdk/ChaincodeCollectionConfigTest.java
