FAB-11305 Channel v1.3 capability for idemix

Identity mixer needs new principal types and other logic which affects
the way that policies are evaluated.  Presently, it is gated behind a
msp version v1.3, however there is no way to enable it.  This CR adds a
v1.3 capability and uses it to enable the new MSP functions.

Change-Id: I99f5299724c4b55d3b54c6aff90a5afe46205ee6
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

Author: Jason Yellick

common/capabilities/channel.go

@@ -16,19 +16,24 @@ const (
 
 	// ChannelV1_1 is the capabilties string for standard new non-backwards compatible fabric v1.1 channel capabilities.
 	ChannelV1_1 = "V1_1"
+
+	// ChannelV1_3 is the capabilties string for standard new non-backwards compatible fabric v1.3 channel capabilities.
+	ChannelV1_3 = "V1_3"
 )
 
 // ChannelProvider provides capabilities information for channel level config.
 type ChannelProvider struct {
 	*registry
 	v11 bool
+	v13 bool
 }
 
 // NewChannelProvider creates a channel capabilities provider.
 func NewChannelProvider(capabilities map[string]*cb.Capability) *ChannelProvider {
 	cp := &ChannelProvider{}
 	cp.registry = newRegistry(cp, capabilities)
 	_, cp.v11 = capabilities[ChannelV1_1]
+	_, cp.v13 = capabilities[ChannelV1_3]
 	return cp
 }
 
@@ -41,6 +46,8 @@ func (cp *ChannelProvider) Type() string {
 func (cp *ChannelProvider) HasCapability(capability string) bool {
 	switch capability {
 	// Add new capability names here
+	case ChannelV1_3:
+		return true
 	case ChannelV1_1:
 		return true
 	default:
@@ -51,6 +58,8 @@ func (cp *ChannelProvider) HasCapability(capability string) bool {
 // MSPVersion returns the level of MSP support required by this channel.
 func (cp *ChannelProvider) MSPVersion() msp.MSPVersion {
 	switch {
+	case cp.v13:
+		return msp.MSPv1_3
 	case cp.v11:
 		return msp.MSPv1_1
 	default:

common/capabilities/channel_test.go

@@ -28,3 +28,12 @@ func TestChannelV11(t *testing.T) {
 	assert.NoError(t, op.Supported())
 	assert.True(t, op.MSPVersion() == msp.MSPv1_1)
 }
+
+func TestChannelV13(t *testing.T) {
+	op := NewChannelProvider(map[string]*cb.Capability{
+		ChannelV1_1: {},
+		ChannelV1_3: {},
+	})
+	assert.NoError(t, op.Supported())
+	assert.True(t, op.MSPVersion() == msp.MSPv1_3)
+}

examples/e2e_cli/configtx.yaml

@@ -159,11 +159,11 @@ Capabilities:
     # Channel capabilities apply to both the orderers and the peers and must be
     # supported by both.  Set the value of the capability to true to require it.
     Global: &ChannelCapabilities
-        # V1.1 for Global is a catchall flag for behavior which has been
-        # determined to be desired for all orderers and peers running v1.0.x,
+        # V1.3 for Channel is a catchall flag for behavior which has been
+        # determined to be desired for all orderers and peers running < v1.3.0,
         # but the modification of which would cause incompatibilities.  Users
         # should leave this flag set to true.
-        V1_1: true
+        V1_3: true
 
     # Orderer capabilities apply only to the orderers, and may be safely
     # manipulated without concern for upgrading peers.  Set the value of the

integration/nwo/configtx_template.go

@@ -47,7 +47,7 @@ Organizations:{{ range .PeerOrgs }}
 
 Channel: &ChannelDefaults
   Capabilities:
-    V1_1: true
+    V1_3: true
   Policies:
     Readers:
       Type: ImplicitMeta

integration/pvtdata/runner/testdata/configtx.yaml

@@ -24,7 +24,7 @@ Organizations:
 
 Capabilities:
   Global: &ChannelCapabilities
-    V1_1: true
+    V1_3: true
   Orderer: &OrdererCapabilities
     V1_1: true
   Application: &ApplicationCapabilities

sampleconfig/configtx.yaml

@@ -79,11 +79,11 @@ Capabilities:
     # Channel capabilities apply to both the orderers and the peers and must be
     # supported by both.  Set the value of the capability to true to require it.
     Channel: &ChannelCapabilities
-        # V1.1 for Channel is a catchall flag for behavior which has been
-        # determined to be desired for all orderers and peers running v1.0.x,
+        # V1.3 for Channel is a catchall flag for behavior which has been
+        # determined to be desired for all orderers and peers running < v1.3.0,
         # but the modification of which would cause incompatibilities.  Users
         # should leave this flag set to true.
-        V1_1: true
+        V1_3: true
 
     # Orderer capabilities apply only to the orderers, and may be safely
     # manipulated without concern for upgrading peers.  Set the value of the